| From d4433926560b9259ed00eb82693f0b23bbb83ad2 Mon Sep 17 00:00:00 2001 |
| From: Jiang Liu <jiang.liu@linux.intel.com> |
| Date: Mon, 13 Jul 2015 20:51:22 +0000 |
| Subject: [PATCH 230/326] sh/irq: Use irq accessor functions instead of open |
| coded access |
| |
| This is a preparatory patch for refactoring the internals if irq_data. |
| |
| Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> |
| Cc: Simon Horman <horms@verge.net.au> |
| Cc: Magnus Damm <magnus.damm@gmail.com> |
| Link: http://lkml.kernel.org/r/20150713151626.616384365@linutronix.de |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| (cherry picked from commit d0abe2f3a9a541ded2e30ef7275f057fb7f0335a) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/sh/intc/virq.c | 12 +++++++----- |
| 1 file changed, 7 insertions(+), 5 deletions(-) |
| |
| diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c |
| index f30ac9354ff2..bc0601cf0f8f 100644 |
| --- a/drivers/sh/intc/virq.c |
| +++ b/drivers/sh/intc/virq.c |
| @@ -83,12 +83,11 @@ EXPORT_SYMBOL_GPL(intc_irq_lookup); |
| |
| static int add_virq_to_pirq(unsigned int irq, unsigned int virq) |
| { |
| - struct intc_virq_list **last, *entry; |
| - struct irq_data *data = irq_get_irq_data(irq); |
| + struct intc_virq_list *entry; |
| + struct intc_virq_list **last = NULL; |
| |
| /* scan for duplicates */ |
| - last = (struct intc_virq_list **)&data->handler_data; |
| - for_each_virq(entry, data->handler_data) { |
| + for_each_virq(entry, irq_get_handler_data(irq)) { |
| if (entry->irq == virq) |
| return 0; |
| last = &entry->next; |
| @@ -102,7 +101,10 @@ static int add_virq_to_pirq(unsigned int irq, unsigned int virq) |
| |
| entry->irq = virq; |
| |
| - *last = entry; |
| + if (last) |
| + *last = entry; |
| + else |
| + irq_set_handler_data(irq, entry); |
| |
| return 0; |
| } |
| -- |
| 2.6.2 |
| |
