leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

irqchip: spear_shirq: No point in storing the parent irq

Browse Source 
The struct member is pointless and a nismomer as well.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20140619212713.129694036@linutronix.de
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Thomas Gleixner
2014-06-19 21:34:39 +00:00
committed by Jason Cooper
parent 078bc00565
commit f37ecbce8b
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/irqchip/spear-shirq.c
View File

@@ -47,7 +47,6 @@ struct shirq_regs {
/* /*
* struct spear_shirq: shared irq structure * struct spear_shirq: shared irq structure
* *
* irq: hardware irq number
* irq_base: base irq in linux domain * irq_base: base irq in linux domain
* irq_nr: no. of shared interrupts in a particular block * irq_nr: no. of shared interrupts in a particular block
* irq_bit_off: starting bit offset in the status register * irq_bit_off: starting bit offset in the status register
@@ -56,7 +55,6 @@ struct shirq_regs {
* regs: register configuration for shared irq block * regs: register configuration for shared irq block
*/ */
struct spear_shirq { struct spear_shirq {
u32 irq;
u32 irq_base; u32 irq_base;
u32 irq_nr; u32 irq_nr;
u32 irq_bit_off; u32 irq_bit_off;
@@ -268,28 +266,29 @@ static void shirq_handler(unsigned irq, struct irq_desc *desc)
chip->irq_unmask(&desc->irq_data); chip->irq_unmask(&desc->irq_data);
} }
static void __init spear_shirq_register(struct spear_shirq *shirq) static void __init spear_shirq_register(struct spear_shirq *shirq,
int parent_irq)
{ {
int i; int i;
if (shirq->invalid_irq) if (shirq->invalid_irq)
return; return;
irq_set_chained_handler(shirq->irq, shirq_handler); irq_set_chained_handler(parent_irq, shirq_handler);
irq_set_handler_data(parent_irq, shirq);
for (i = 0; i < shirq->irq_nr; i++) { for (i = 0; i < shirq->irq_nr; i++) {
irq_set_chip_and_handler(shirq->irq_base + i, irq_set_chip_and_handler(shirq->irq_base + i,
&shirq_chip, handle_simple_irq); &shirq_chip, handle_simple_irq);
set_irq_flags(shirq->irq_base + i, IRQF_VALID); set_irq_flags(shirq->irq_base + i, IRQF_VALID);
irq_set_chip_data(shirq->irq_base + i, shirq); irq_set_chip_data(shirq->irq_base + i, shirq);
} }
irq_set_handler_data(shirq->irq, shirq);
} }
static int __init shirq_init(struct spear_shirq **shirq_blocks, int block_nr, static int __init shirq_init(struct spear_shirq **shirq_blocks, int block_nr,
struct device_node *np) struct device_node *np)
{ {
int i, irq_base, hwirq = 0, irq_nr = 0; int i, parent_irq, irq_base, hwirq = 0, irq_nr = 0;
struct irq_domain *shirq_domain; struct irq_domain *shirq_domain;
void __iomem *base; void __iomem *base;
@@ -319,9 +318,9 @@ static int __init shirq_init(struct spear_shirq **shirq_blocks, int block_nr,
shirq_blocks[i]->base = base; shirq_blocks[i]->base = base;
shirq_blocks[i]->irq_base = irq_find_mapping(shirq_domain, shirq_blocks[i]->irq_base = irq_find_mapping(shirq_domain,
hwirq); hwirq);
shirq_blocks[i]->irq = irq_of_parse_and_map(np, i);
spear_shirq_register(shirq_blocks[i]); parent_irq = irq_of_parse_and_map(np, i);
spear_shirq_register(shirq_blocks[i], parent_irq);
hwirq += shirq_blocks[i]->irq_nr; hwirq += shirq_blocks[i]->irq_nr;
} }