diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2011-01-22 06:32:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-16 21:19:02 -0400 |
commit | e6ebd529e4a6ddac43bc447f39d1f8a0e4d79864 (patch) | |
tree | 07c4726b2a078afeb0b18f38c90232437427817f | |
parent | cae78728003e41e9346b92f9a1cc5ca3c3e5e70e (diff) |
sparc64: use {get,set}_irq_data for handler_data
{get,set}_irq_data uses the member "handler_data" in irq_data
which fits the naem of the datatype.
The change has no functional impact
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc/kernel/irq_64.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c index a763f9a6358e..b07fc79b7d5d 100644 --- a/arch/sparc/kernel/irq_64.c +++ b/arch/sparc/kernel/irq_64.c | |||
@@ -277,7 +277,7 @@ static int irq_choose_cpu(unsigned int virt_irq, const struct cpumask *affinity) | |||
277 | 277 | ||
278 | static void sun4u_irq_enable(unsigned int virt_irq) | 278 | static void sun4u_irq_enable(unsigned int virt_irq) |
279 | { | 279 | { |
280 | struct irq_handler_data *handler_data = get_irq_chip_data(virt_irq); | 280 | struct irq_handler_data *handler_data = get_irq_data(virt_irq); |
281 | 281 | ||
282 | if (likely(handler_data)) { | 282 | if (likely(handler_data)) { |
283 | unsigned long cpuid, imap, val; | 283 | unsigned long cpuid, imap, val; |
@@ -301,7 +301,7 @@ static void sun4u_irq_enable(unsigned int virt_irq) | |||
301 | static int sun4u_set_affinity(unsigned int virt_irq, | 301 | static int sun4u_set_affinity(unsigned int virt_irq, |
302 | const struct cpumask *mask) | 302 | const struct cpumask *mask) |
303 | { | 303 | { |
304 | struct irq_handler_data *handler_data = get_irq_chip_data(virt_irq); | 304 | struct irq_handler_data *handler_data = get_irq_data(virt_irq); |
305 | 305 | ||
306 | if (likely(handler_data)) { | 306 | if (likely(handler_data)) { |
307 | unsigned long cpuid, imap, val; | 307 | unsigned long cpuid, imap, val; |
@@ -346,7 +346,7 @@ static void sun4u_irq_disable(unsigned int virt_irq) | |||
346 | 346 | ||
347 | static void sun4u_irq_eoi(unsigned int virt_irq) | 347 | static void sun4u_irq_eoi(unsigned int virt_irq) |
348 | { | 348 | { |
349 | struct irq_handler_data *handler_data = get_irq_chip_data(virt_irq); | 349 | struct irq_handler_data *handler_data = get_irq_data(virt_irq); |
350 | struct irq_desc *desc = irq_desc + virt_irq; | 350 | struct irq_desc *desc = irq_desc + virt_irq; |
351 | 351 | ||
352 | if (unlikely(desc->status & (IRQ_DISABLED|IRQ_INPROGRESS))) | 352 | if (unlikely(desc->status & (IRQ_DISABLED|IRQ_INPROGRESS))) |
@@ -530,7 +530,7 @@ static struct irq_chip sun4v_virq = { | |||
530 | static void pre_flow_handler(unsigned int virt_irq, | 530 | static void pre_flow_handler(unsigned int virt_irq, |
531 | struct irq_desc *desc) | 531 | struct irq_desc *desc) |
532 | { | 532 | { |
533 | struct irq_handler_data *handler_data = get_irq_chip_data(virt_irq); | 533 | struct irq_handler_data *handler_data = get_irq_data(virt_irq); |
534 | unsigned int ino = virt_irq_table[virt_irq].dev_ino; | 534 | unsigned int ino = virt_irq_table[virt_irq].dev_ino; |
535 | 535 | ||
536 | handler_data->pre_handler(ino, handler_data->arg1, handler_data->arg2); | 536 | handler_data->pre_handler(ino, handler_data->arg1, handler_data->arg2); |
@@ -542,7 +542,7 @@ void irq_install_pre_handler(int virt_irq, | |||
542 | void (*func)(unsigned int, void *, void *), | 542 | void (*func)(unsigned int, void *, void *), |
543 | void *arg1, void *arg2) | 543 | void *arg1, void *arg2) |
544 | { | 544 | { |
545 | struct irq_handler_data *handler_data = get_irq_chip_data(virt_irq); | 545 | struct irq_handler_data *handler_data = get_irq_data(virt_irq); |
546 | struct irq_desc *desc = irq_desc + virt_irq; | 546 | struct irq_desc *desc = irq_desc + virt_irq; |
547 | 547 | ||
548 | handler_data->pre_handler = func; | 548 | handler_data->pre_handler = func; |
@@ -573,7 +573,7 @@ unsigned int build_irq(int inofixup, unsigned long iclr, unsigned long imap) | |||
573 | "IVEC"); | 573 | "IVEC"); |
574 | } | 574 | } |
575 | 575 | ||
576 | handler_data = get_irq_chip_data(virt_irq); | 576 | handler_data = get_irq_data(virt_irq); |
577 | if (unlikely(handler_data)) | 577 | if (unlikely(handler_data)) |
578 | goto out; | 578 | goto out; |
579 | 579 | ||
@@ -582,7 +582,7 @@ unsigned int build_irq(int inofixup, unsigned long iclr, unsigned long imap) | |||
582 | prom_printf("IRQ: kzalloc(irq_handler_data) failed.\n"); | 582 | prom_printf("IRQ: kzalloc(irq_handler_data) failed.\n"); |
583 | prom_halt(); | 583 | prom_halt(); |
584 | } | 584 | } |
585 | set_irq_chip_data(virt_irq, handler_data); | 585 | set_irq_data(virt_irq, handler_data); |
586 | 586 | ||
587 | handler_data->imap = imap; | 587 | handler_data->imap = imap; |
588 | handler_data->iclr = iclr; | 588 | handler_data->iclr = iclr; |
@@ -610,7 +610,7 @@ static unsigned int sun4v_build_common(unsigned long sysino, | |||
610 | "IVEC"); | 610 | "IVEC"); |
611 | } | 611 | } |
612 | 612 | ||
613 | handler_data = get_irq_chip_data(virt_irq); | 613 | handler_data = get_irq_data(virt_irq); |
614 | if (unlikely(handler_data)) | 614 | if (unlikely(handler_data)) |
615 | goto out; | 615 | goto out; |
616 | 616 | ||
@@ -619,7 +619,7 @@ static unsigned int sun4v_build_common(unsigned long sysino, | |||
619 | prom_printf("IRQ: kzalloc(irq_handler_data) failed.\n"); | 619 | prom_printf("IRQ: kzalloc(irq_handler_data) failed.\n"); |
620 | prom_halt(); | 620 | prom_halt(); |
621 | } | 621 | } |
622 | set_irq_chip_data(virt_irq, handler_data); | 622 | set_irq_data(virt_irq, handler_data); |
623 | 623 | ||
624 | /* Catch accidental accesses to these things. IMAP/ICLR handling | 624 | /* Catch accidental accesses to these things. IMAP/ICLR handling |
625 | * is done by hypervisor calls on sun4v platforms, not by direct | 625 | * is done by hypervisor calls on sun4v platforms, not by direct |
@@ -680,7 +680,7 @@ unsigned int sun4v_build_virq(u32 devhandle, unsigned int devino) | |||
680 | desc = irq_desc + virt_irq; | 680 | desc = irq_desc + virt_irq; |
681 | desc->status |= IRQ_NOAUTOEN; | 681 | desc->status |= IRQ_NOAUTOEN; |
682 | 682 | ||
683 | set_irq_chip_data(virt_irq, handler_data); | 683 | set_irq_data(virt_irq, handler_data); |
684 | 684 | ||
685 | /* Catch accidental accesses to these things. IMAP/ICLR handling | 685 | /* Catch accidental accesses to these things. IMAP/ICLR handling |
686 | * is done by hypervisor calls on sun4v platforms, not by direct | 686 | * is done by hypervisor calls on sun4v platforms, not by direct |