diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-04-17 16:53:04 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-11-08 16:35:47 -0500 |
commit | e8abf5e73cdb6c034d35ccba1f63a4801cd3dec5 (patch) | |
tree | 170de6cb1d0048757b2ab55b2a0bfeb87d274fd4 /arch/m68k/amiga/amiints.c | |
parent | 6549d537922da6a6893e9bc1be9c2b89db663719 (diff) |
m68k/irq: Switch irq_chip methods to "struct irq_data *data"
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/m68k/amiga/amiints.c')
-rw-r--r-- | arch/m68k/amiga/amiints.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/m68k/amiga/amiints.c b/arch/m68k/amiga/amiints.c index 320c5d048dc7..09a695babfe9 100644 --- a/arch/m68k/amiga/amiints.c +++ b/arch/m68k/amiga/amiints.c | |||
@@ -45,8 +45,8 @@ | |||
45 | #include <asm/amigaints.h> | 45 | #include <asm/amigaints.h> |
46 | #include <asm/amipcmcia.h> | 46 | #include <asm/amipcmcia.h> |
47 | 47 | ||
48 | static void amiga_enable_irq(unsigned int irq); | 48 | static void amiga_irq_enable(struct irq_data *data); |
49 | static void amiga_disable_irq(unsigned int irq); | 49 | static void amiga_irq_disable(struct irq_data *data); |
50 | static irqreturn_t ami_int1(int irq, void *dev_id); | 50 | static irqreturn_t ami_int1(int irq, void *dev_id); |
51 | static irqreturn_t ami_int3(int irq, void *dev_id); | 51 | static irqreturn_t ami_int3(int irq, void *dev_id); |
52 | static irqreturn_t ami_int4(int irq, void *dev_id); | 52 | static irqreturn_t ami_int4(int irq, void *dev_id); |
@@ -54,8 +54,8 @@ static irqreturn_t ami_int5(int irq, void *dev_id); | |||
54 | 54 | ||
55 | static struct irq_chip amiga_irq_chip = { | 55 | static struct irq_chip amiga_irq_chip = { |
56 | .name = "amiga", | 56 | .name = "amiga", |
57 | .irq_enable = amiga_enable_irq, | 57 | .irq_enable = amiga_irq_enable, |
58 | .irq_disable = amiga_disable_irq, | 58 | .irq_disable = amiga_irq_disable, |
59 | }; | 59 | }; |
60 | 60 | ||
61 | /* | 61 | /* |
@@ -102,14 +102,14 @@ void __init amiga_init_IRQ(void) | |||
102 | * internal data, that may not be changed by the interrupt at the same time. | 102 | * internal data, that may not be changed by the interrupt at the same time. |
103 | */ | 103 | */ |
104 | 104 | ||
105 | static void amiga_enable_irq(unsigned int irq) | 105 | static void amiga_irq_enable(struct irq_data *data) |
106 | { | 106 | { |
107 | amiga_custom.intena = IF_SETCLR | (1 << (irq - IRQ_USER)); | 107 | amiga_custom.intena = IF_SETCLR | (1 << (data->irq - IRQ_USER)); |
108 | } | 108 | } |
109 | 109 | ||
110 | static void amiga_disable_irq(unsigned int irq) | 110 | static void amiga_irq_disable(struct irq_data *data) |
111 | { | 111 | { |
112 | amiga_custom.intena = 1 << (irq - IRQ_USER); | 112 | amiga_custom.intena = 1 << (data->irq - IRQ_USER); |
113 | } | 113 | } |
114 | 114 | ||
115 | /* | 115 | /* |