diff options
Diffstat (limited to 'drivers')
84 files changed, 117 insertions, 132 deletions
diff --git a/drivers/dma/ipu/ipu_irq.c b/drivers/dma/ipu/ipu_irq.c index 4768a829253a..2bf37e68ad0f 100644 --- a/drivers/dma/ipu/ipu_irq.c +++ b/drivers/dma/ipu/ipu_irq.c | |||
@@ -266,7 +266,7 @@ int ipu_irq_unmap(unsigned int source) | |||
266 | } | 266 | } |
267 | 267 | ||
268 | /* Chained IRQ handler for IPU function and error interrupt */ | 268 | /* Chained IRQ handler for IPU function and error interrupt */ |
269 | static void ipu_irq_handler(unsigned int __irq, struct irq_desc *desc) | 269 | static void ipu_irq_handler(struct irq_desc *desc) |
270 | { | 270 | { |
271 | struct ipu *ipu = irq_desc_get_handler_data(desc); | 271 | struct ipu *ipu = irq_desc_get_handler_data(desc); |
272 | u32 status; | 272 | u32 status; |
diff --git a/drivers/gpio/gpio-altera.c b/drivers/gpio/gpio-altera.c index 9b7e0b3db387..1b44941574fa 100644 --- a/drivers/gpio/gpio-altera.c +++ b/drivers/gpio/gpio-altera.c | |||
@@ -201,8 +201,7 @@ static int altera_gpio_direction_output(struct gpio_chip *gc, | |||
201 | return 0; | 201 | return 0; |
202 | } | 202 | } |
203 | 203 | ||
204 | static void altera_gpio_irq_edge_handler(unsigned int irq, | 204 | static void altera_gpio_irq_edge_handler(struct irq_desc *desc) |
205 | struct irq_desc *desc) | ||
206 | { | 205 | { |
207 | struct altera_gpio_chip *altera_gc; | 206 | struct altera_gpio_chip *altera_gc; |
208 | struct irq_chip *chip; | 207 | struct irq_chip *chip; |
@@ -231,8 +230,7 @@ static void altera_gpio_irq_edge_handler(unsigned int irq, | |||
231 | } | 230 | } |
232 | 231 | ||
233 | 232 | ||
234 | static void altera_gpio_irq_leveL_high_handler(unsigned int irq, | 233 | static void altera_gpio_irq_leveL_high_handler(struct irq_desc *desc) |
235 | struct irq_desc *desc) | ||
236 | { | 234 | { |
237 | struct altera_gpio_chip *altera_gc; | 235 | struct altera_gpio_chip *altera_gc; |
238 | struct irq_chip *chip; | 236 | struct irq_chip *chip; |
diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c index 31b90ac15204..33a1f9779b86 100644 --- a/drivers/gpio/gpio-bcm-kona.c +++ b/drivers/gpio/gpio-bcm-kona.c | |||
@@ -433,7 +433,7 @@ static int bcm_kona_gpio_irq_set_type(struct irq_data *d, unsigned int type) | |||
433 | return 0; | 433 | return 0; |
434 | } | 434 | } |
435 | 435 | ||
436 | static void bcm_kona_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) | 436 | static void bcm_kona_gpio_irq_handler(struct irq_desc *desc) |
437 | { | 437 | { |
438 | void __iomem *reg_base; | 438 | void __iomem *reg_base; |
439 | int bit, bank_id; | 439 | int bit, bank_id; |
diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index 9ea86d2ac054..4c64627c6bb5 100644 --- a/drivers/gpio/gpio-brcmstb.c +++ b/drivers/gpio/gpio-brcmstb.c | |||
@@ -236,7 +236,7 @@ static void brcmstb_gpio_irq_bank_handler(struct brcmstb_gpio_bank *bank) | |||
236 | } | 236 | } |
237 | 237 | ||
238 | /* Each UPG GIO block has one IRQ for all banks */ | 238 | /* Each UPG GIO block has one IRQ for all banks */ |
239 | static void brcmstb_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) | 239 | static void brcmstb_gpio_irq_handler(struct irq_desc *desc) |
240 | { | 240 | { |
241 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); | 241 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); |
242 | struct brcmstb_gpio_priv *priv = brcmstb_gpio_gc_to_priv(gc); | 242 | struct brcmstb_gpio_priv *priv = brcmstb_gpio_gc_to_priv(gc); |
diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c index 94b0ab709721..5e715388803d 100644 --- a/drivers/gpio/gpio-davinci.c +++ b/drivers/gpio/gpio-davinci.c | |||
@@ -326,8 +326,7 @@ static struct irq_chip gpio_irqchip = { | |||
326 | .flags = IRQCHIP_SET_TYPE_MASKED, | 326 | .flags = IRQCHIP_SET_TYPE_MASKED, |
327 | }; | 327 | }; |
328 | 328 | ||
329 | static void | 329 | static void gpio_irq_handler(struct irq_desc *desc) |
330 | gpio_irq_handler(unsigned __irq, struct irq_desc *desc) | ||
331 | { | 330 | { |
332 | unsigned int irq = irq_desc_get_irq(desc); | 331 | unsigned int irq = irq_desc_get_irq(desc); |
333 | struct davinci_gpio_regs __iomem *g; | 332 | struct davinci_gpio_regs __iomem *g; |
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c index c5be4b9b8baf..fcd5b0acfc72 100644 --- a/drivers/gpio/gpio-dwapb.c +++ b/drivers/gpio/gpio-dwapb.c | |||
@@ -147,7 +147,7 @@ static u32 dwapb_do_irq(struct dwapb_gpio *gpio) | |||
147 | return ret; | 147 | return ret; |
148 | } | 148 | } |
149 | 149 | ||
150 | static void dwapb_irq_handler(u32 irq, struct irq_desc *desc) | 150 | static void dwapb_irq_handler(struct irq_desc *desc) |
151 | { | 151 | { |
152 | struct dwapb_gpio *gpio = irq_desc_get_handler_data(desc); | 152 | struct dwapb_gpio *gpio = irq_desc_get_handler_data(desc); |
153 | struct irq_chip *chip = irq_desc_get_chip(desc); | 153 | struct irq_chip *chip = irq_desc_get_chip(desc); |
diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c index 9d90366ea259..3e3947b35c83 100644 --- a/drivers/gpio/gpio-ep93xx.c +++ b/drivers/gpio/gpio-ep93xx.c | |||
@@ -78,7 +78,7 @@ static void ep93xx_gpio_int_debounce(unsigned int irq, bool enable) | |||
78 | EP93XX_GPIO_REG(int_debounce_register_offset[port])); | 78 | EP93XX_GPIO_REG(int_debounce_register_offset[port])); |
79 | } | 79 | } |
80 | 80 | ||
81 | static void ep93xx_gpio_ab_irq_handler(unsigned int irq, struct irq_desc *desc) | 81 | static void ep93xx_gpio_ab_irq_handler(struct irq_desc *desc) |
82 | { | 82 | { |
83 | unsigned char status; | 83 | unsigned char status; |
84 | int i; | 84 | int i; |
@@ -100,8 +100,7 @@ static void ep93xx_gpio_ab_irq_handler(unsigned int irq, struct irq_desc *desc) | |||
100 | } | 100 | } |
101 | } | 101 | } |
102 | 102 | ||
103 | static void ep93xx_gpio_f_irq_handler(unsigned int __irq, | 103 | static void ep93xx_gpio_f_irq_handler(struct irq_desc *desc) |
104 | struct irq_desc *desc) | ||
105 | { | 104 | { |
106 | /* | 105 | /* |
107 | * map discontiguous hw irq range to continuous sw irq range: | 106 | * map discontiguous hw irq range to continuous sw irq range: |
diff --git a/drivers/gpio/gpio-intel-mid.c b/drivers/gpio/gpio-intel-mid.c index aa28c65eb6b4..70097472b02c 100644 --- a/drivers/gpio/gpio-intel-mid.c +++ b/drivers/gpio/gpio-intel-mid.c | |||
@@ -301,7 +301,7 @@ static const struct pci_device_id intel_gpio_ids[] = { | |||
301 | }; | 301 | }; |
302 | MODULE_DEVICE_TABLE(pci, intel_gpio_ids); | 302 | MODULE_DEVICE_TABLE(pci, intel_gpio_ids); |
303 | 303 | ||
304 | static void intel_mid_irq_handler(unsigned irq, struct irq_desc *desc) | 304 | static void intel_mid_irq_handler(struct irq_desc *desc) |
305 | { | 305 | { |
306 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); | 306 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); |
307 | struct intel_mid_gpio *priv = to_intel_gpio_priv(gc); | 307 | struct intel_mid_gpio *priv = to_intel_gpio_priv(gc); |
diff --git a/drivers/gpio/gpio-lynxpoint.c b/drivers/gpio/gpio-lynxpoint.c index 153af464c7a7..127c37b380ae 100644 --- a/drivers/gpio/gpio-lynxpoint.c +++ b/drivers/gpio/gpio-lynxpoint.c | |||
@@ -234,7 +234,7 @@ static int lp_gpio_direction_output(struct gpio_chip *chip, | |||
234 | return 0; | 234 | return 0; |
235 | } | 235 | } |
236 | 236 | ||
237 | static void lp_gpio_irq_handler(unsigned hwirq, struct irq_desc *desc) | 237 | static void lp_gpio_irq_handler(struct irq_desc *desc) |
238 | { | 238 | { |
239 | struct irq_data *data = irq_desc_get_irq_data(desc); | 239 | struct irq_data *data = irq_desc_get_irq_data(desc); |
240 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); | 240 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); |
diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c index 8ef7a12de983..48ef368347ab 100644 --- a/drivers/gpio/gpio-mpc8xxx.c +++ b/drivers/gpio/gpio-mpc8xxx.c | |||
@@ -194,7 +194,7 @@ static int mpc8xxx_gpio_to_irq(struct gpio_chip *gc, unsigned offset) | |||
194 | return -ENXIO; | 194 | return -ENXIO; |
195 | } | 195 | } |
196 | 196 | ||
197 | static void mpc8xxx_gpio_irq_cascade(unsigned int irq, struct irq_desc *desc) | 197 | static void mpc8xxx_gpio_irq_cascade(struct irq_desc *desc) |
198 | { | 198 | { |
199 | struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_desc_get_handler_data(desc); | 199 | struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_desc_get_handler_data(desc); |
200 | struct irq_chip *chip = irq_desc_get_chip(desc); | 200 | struct irq_chip *chip = irq_desc_get_chip(desc); |
diff --git a/drivers/gpio/gpio-msic.c b/drivers/gpio/gpio-msic.c index 7bcfb87a5fa6..22523aae8abe 100644 --- a/drivers/gpio/gpio-msic.c +++ b/drivers/gpio/gpio-msic.c | |||
@@ -232,7 +232,7 @@ static struct irq_chip msic_irqchip = { | |||
232 | .irq_bus_sync_unlock = msic_bus_sync_unlock, | 232 | .irq_bus_sync_unlock = msic_bus_sync_unlock, |
233 | }; | 233 | }; |
234 | 234 | ||
235 | static void msic_gpio_irq_handler(unsigned irq, struct irq_desc *desc) | 235 | static void msic_gpio_irq_handler(struct irq_desc *desc) |
236 | { | 236 | { |
237 | struct irq_data *data = irq_desc_get_irq_data(desc); | 237 | struct irq_data *data = irq_desc_get_irq_data(desc); |
238 | struct msic_gpio *mg = irq_data_get_irq_handler_data(data); | 238 | struct msic_gpio *mg = irq_data_get_irq_handler_data(data); |
diff --git a/drivers/gpio/gpio-msm-v2.c b/drivers/gpio/gpio-msm-v2.c index d2012cfb5571..4b4222145f10 100644 --- a/drivers/gpio/gpio-msm-v2.c +++ b/drivers/gpio/gpio-msm-v2.c | |||
@@ -305,7 +305,7 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int flow_type) | |||
305 | * which have been set as summary IRQ lines and which are triggered, | 305 | * which have been set as summary IRQ lines and which are triggered, |
306 | * and to call their interrupt handlers. | 306 | * and to call their interrupt handlers. |
307 | */ | 307 | */ |
308 | static void msm_summary_irq_handler(unsigned int irq, struct irq_desc *desc) | 308 | static void msm_summary_irq_handler(struct irq_desc *desc) |
309 | { | 309 | { |
310 | unsigned long i; | 310 | unsigned long i; |
311 | struct irq_chip *chip = irq_desc_get_chip(desc); | 311 | struct irq_chip *chip = irq_desc_get_chip(desc); |
diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c index b396bf3bf294..df418b81456d 100644 --- a/drivers/gpio/gpio-mvebu.c +++ b/drivers/gpio/gpio-mvebu.c | |||
@@ -458,7 +458,7 @@ static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type) | |||
458 | return 0; | 458 | return 0; |
459 | } | 459 | } |
460 | 460 | ||
461 | static void mvebu_gpio_irq_handler(unsigned int __irq, struct irq_desc *desc) | 461 | static void mvebu_gpio_irq_handler(struct irq_desc *desc) |
462 | { | 462 | { |
463 | struct mvebu_gpio_chip *mvchip = irq_desc_get_handler_data(desc); | 463 | struct mvebu_gpio_chip *mvchip = irq_desc_get_handler_data(desc); |
464 | struct irq_chip *chip = irq_desc_get_chip(desc); | 464 | struct irq_chip *chip = irq_desc_get_chip(desc); |
diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c index b752b560126e..5e3235a73bf9 100644 --- a/drivers/gpio/gpio-mxc.c +++ b/drivers/gpio/gpio-mxc.c | |||
@@ -272,7 +272,7 @@ static void mxc_gpio_irq_handler(struct mxc_gpio_port *port, u32 irq_stat) | |||
272 | } | 272 | } |
273 | 273 | ||
274 | /* MX1 and MX3 has one interrupt *per* gpio port */ | 274 | /* MX1 and MX3 has one interrupt *per* gpio port */ |
275 | static void mx3_gpio_irq_handler(u32 irq, struct irq_desc *desc) | 275 | static void mx3_gpio_irq_handler(struct irq_desc *desc) |
276 | { | 276 | { |
277 | u32 irq_stat; | 277 | u32 irq_stat; |
278 | struct mxc_gpio_port *port = irq_desc_get_handler_data(desc); | 278 | struct mxc_gpio_port *port = irq_desc_get_handler_data(desc); |
@@ -288,7 +288,7 @@ static void mx3_gpio_irq_handler(u32 irq, struct irq_desc *desc) | |||
288 | } | 288 | } |
289 | 289 | ||
290 | /* MX2 has one interrupt *for all* gpio ports */ | 290 | /* MX2 has one interrupt *for all* gpio ports */ |
291 | static void mx2_gpio_irq_handler(u32 irq, struct irq_desc *desc) | 291 | static void mx2_gpio_irq_handler(struct irq_desc *desc) |
292 | { | 292 | { |
293 | u32 irq_msk, irq_stat; | 293 | u32 irq_msk, irq_stat; |
294 | struct mxc_gpio_port *port; | 294 | struct mxc_gpio_port *port; |
diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c index b7f383eb18d9..b7763f078b23 100644 --- a/drivers/gpio/gpio-mxs.c +++ b/drivers/gpio/gpio-mxs.c | |||
@@ -154,7 +154,7 @@ static void mxs_flip_edge(struct mxs_gpio_port *port, u32 gpio) | |||
154 | } | 154 | } |
155 | 155 | ||
156 | /* MXS has one interrupt *per* gpio port */ | 156 | /* MXS has one interrupt *per* gpio port */ |
157 | static void mxs_gpio_irq_handler(u32 irq, struct irq_desc *desc) | 157 | static void mxs_gpio_irq_handler(struct irq_desc *desc) |
158 | { | 158 | { |
159 | u32 irq_stat; | 159 | u32 irq_stat; |
160 | struct mxs_gpio_port *port = irq_desc_get_handler_data(desc); | 160 | struct mxs_gpio_port *port = irq_desc_get_handler_data(desc); |
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 2ae0d47e9554..9df014c0e3e4 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c | |||
@@ -709,7 +709,7 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset) | |||
709 | * line's interrupt handler has been run, we may miss some nested | 709 | * line's interrupt handler has been run, we may miss some nested |
710 | * interrupts. | 710 | * interrupts. |
711 | */ | 711 | */ |
712 | static void omap_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) | 712 | static void omap_gpio_irq_handler(struct irq_desc *desc) |
713 | { | 713 | { |
714 | void __iomem *isr_reg = NULL; | 714 | void __iomem *isr_reg = NULL; |
715 | u32 isr; | 715 | u32 isr; |
diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c index 04756130437f..229ef653e0f8 100644 --- a/drivers/gpio/gpio-pl061.c +++ b/drivers/gpio/gpio-pl061.c | |||
@@ -187,7 +187,7 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger) | |||
187 | return 0; | 187 | return 0; |
188 | } | 188 | } |
189 | 189 | ||
190 | static void pl061_irq_handler(unsigned irq, struct irq_desc *desc) | 190 | static void pl061_irq_handler(struct irq_desc *desc) |
191 | { | 191 | { |
192 | unsigned long pending; | 192 | unsigned long pending; |
193 | int offset; | 193 | int offset; |
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index 55a11de3d5b7..df2ce550f309 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c | |||
@@ -401,7 +401,7 @@ static int pxa_gpio_irq_type(struct irq_data *d, unsigned int type) | |||
401 | return 0; | 401 | return 0; |
402 | } | 402 | } |
403 | 403 | ||
404 | static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc) | 404 | static void pxa_gpio_demux_handler(struct irq_desc *desc) |
405 | { | 405 | { |
406 | struct pxa_gpio_chip *c; | 406 | struct pxa_gpio_chip *c; |
407 | int loop, gpio, gpio_base, n; | 407 | int loop, gpio, gpio_base, n; |
diff --git a/drivers/gpio/gpio-sa1100.c b/drivers/gpio/gpio-sa1100.c index 67bd2f5d89e8..990fa9023e22 100644 --- a/drivers/gpio/gpio-sa1100.c +++ b/drivers/gpio/gpio-sa1100.c | |||
@@ -172,8 +172,7 @@ static struct irq_domain *sa1100_gpio_irqdomain; | |||
172 | * irq_controller_lock held, and IRQs disabled. Decode the IRQ | 172 | * irq_controller_lock held, and IRQs disabled. Decode the IRQ |
173 | * and call the handler. | 173 | * and call the handler. |
174 | */ | 174 | */ |
175 | static void | 175 | static void sa1100_gpio_handler(struct irq_desc *desc) |
176 | sa1100_gpio_handler(unsigned int __irq, struct irq_desc *desc) | ||
177 | { | 176 | { |
178 | unsigned int irq, mask; | 177 | unsigned int irq, mask; |
179 | 178 | ||
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c index 9b14aafb576d..027e5f47dd28 100644 --- a/drivers/gpio/gpio-tegra.c +++ b/drivers/gpio/gpio-tegra.c | |||
@@ -266,7 +266,7 @@ static void tegra_gpio_irq_shutdown(struct irq_data *d) | |||
266 | gpiochip_unlock_as_irq(&tegra_gpio_chip, gpio); | 266 | gpiochip_unlock_as_irq(&tegra_gpio_chip, gpio); |
267 | } | 267 | } |
268 | 268 | ||
269 | static void tegra_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) | 269 | static void tegra_gpio_irq_handler(struct irq_desc *desc) |
270 | { | 270 | { |
271 | int port; | 271 | int port; |
272 | int pin; | 272 | int pin; |
diff --git a/drivers/gpio/gpio-timberdale.c b/drivers/gpio/gpio-timberdale.c index 5a492054589f..30653e6319e9 100644 --- a/drivers/gpio/gpio-timberdale.c +++ b/drivers/gpio/gpio-timberdale.c | |||
@@ -192,7 +192,7 @@ out: | |||
192 | return ret; | 192 | return ret; |
193 | } | 193 | } |
194 | 194 | ||
195 | static void timbgpio_irq(unsigned int irq, struct irq_desc *desc) | 195 | static void timbgpio_irq(struct irq_desc *desc) |
196 | { | 196 | { |
197 | struct timbgpio *tgpio = irq_desc_get_handler_data(desc); | 197 | struct timbgpio *tgpio = irq_desc_get_handler_data(desc); |
198 | struct irq_data *data = irq_desc_get_irq_data(desc); | 198 | struct irq_data *data = irq_desc_get_irq_data(desc); |
diff --git a/drivers/gpio/gpio-tz1090.c b/drivers/gpio/gpio-tz1090.c index bbac92ae4c32..87bb1b1eee8d 100644 --- a/drivers/gpio/gpio-tz1090.c +++ b/drivers/gpio/gpio-tz1090.c | |||
@@ -375,7 +375,7 @@ static int gpio_set_irq_wake(struct irq_data *data, unsigned int on) | |||
375 | #define gpio_set_irq_wake NULL | 375 | #define gpio_set_irq_wake NULL |
376 | #endif | 376 | #endif |
377 | 377 | ||
378 | static void tz1090_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) | 378 | static void tz1090_gpio_irq_handler(struct irq_desc *desc) |
379 | { | 379 | { |
380 | irq_hw_number_t hw; | 380 | irq_hw_number_t hw; |
381 | unsigned int irq_stat, irq_no; | 381 | unsigned int irq_stat, irq_no; |
@@ -400,7 +400,7 @@ static void tz1090_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) | |||
400 | == IRQ_TYPE_EDGE_BOTH) | 400 | == IRQ_TYPE_EDGE_BOTH) |
401 | tz1090_gpio_irq_next_edge(bank, hw); | 401 | tz1090_gpio_irq_next_edge(bank, hw); |
402 | 402 | ||
403 | generic_handle_irq_desc(irq_no, child_desc); | 403 | generic_handle_irq_desc(child_desc); |
404 | } | 404 | } |
405 | } | 405 | } |
406 | 406 | ||
diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c index 7a6640b51911..069f9e4b7daa 100644 --- a/drivers/gpio/gpio-vf610.c +++ b/drivers/gpio/gpio-vf610.c | |||
@@ -120,7 +120,7 @@ static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, | |||
120 | return pinctrl_gpio_direction_output(chip->base + gpio); | 120 | return pinctrl_gpio_direction_output(chip->base + gpio); |
121 | } | 121 | } |
122 | 122 | ||
123 | static void vf610_gpio_irq_handler(u32 irq, struct irq_desc *desc) | 123 | static void vf610_gpio_irq_handler(struct irq_desc *desc) |
124 | { | 124 | { |
125 | struct vf610_gpio_port *port = irq_desc_get_handler_data(desc); | 125 | struct vf610_gpio_port *port = irq_desc_get_handler_data(desc); |
126 | struct irq_chip *chip = irq_desc_get_chip(desc); | 126 | struct irq_chip *chip = irq_desc_get_chip(desc); |
diff --git a/drivers/gpio/gpio-zx.c b/drivers/gpio/gpio-zx.c index 12ee1969298c..4b8a26910705 100644 --- a/drivers/gpio/gpio-zx.c +++ b/drivers/gpio/gpio-zx.c | |||
@@ -177,7 +177,7 @@ static int zx_irq_type(struct irq_data *d, unsigned trigger) | |||
177 | return 0; | 177 | return 0; |
178 | } | 178 | } |
179 | 179 | ||
180 | static void zx_irq_handler(unsigned irq, struct irq_desc *desc) | 180 | static void zx_irq_handler(struct irq_desc *desc) |
181 | { | 181 | { |
182 | unsigned long pending; | 182 | unsigned long pending; |
183 | int offset; | 183 | int offset; |
diff --git a/drivers/gpio/gpio-zynq.c b/drivers/gpio/gpio-zynq.c index 27348e7cb705..1d1a5865ede9 100644 --- a/drivers/gpio/gpio-zynq.c +++ b/drivers/gpio/gpio-zynq.c | |||
@@ -514,7 +514,7 @@ static void zynq_gpio_handle_bank_irq(struct zynq_gpio *gpio, | |||
514 | * application for that pin. | 514 | * application for that pin. |
515 | * Note: A bug is reported if no handler is set for the gpio pin. | 515 | * Note: A bug is reported if no handler is set for the gpio pin. |
516 | */ | 516 | */ |
517 | static void zynq_gpio_irqhandler(unsigned int irq, struct irq_desc *desc) | 517 | static void zynq_gpio_irqhandler(struct irq_desc *desc) |
518 | { | 518 | { |
519 | u32 int_sts, int_enb; | 519 | u32 int_sts, int_enb; |
520 | unsigned int bank_num; | 520 | unsigned int bank_num; |
diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c index 243f99a80253..649d03be2f38 100644 --- a/drivers/gpu/ipu-v3/ipu-common.c +++ b/drivers/gpu/ipu-v3/ipu-common.c | |||
@@ -912,7 +912,7 @@ static void ipu_irq_handle(struct ipu_soc *ipu, const int *regs, int num_regs) | |||
912 | } | 912 | } |
913 | } | 913 | } |
914 | 914 | ||
915 | static void ipu_irq_handler(unsigned int irq, struct irq_desc *desc) | 915 | static void ipu_irq_handler(struct irq_desc *desc) |
916 | { | 916 | { |
917 | struct ipu_soc *ipu = irq_desc_get_handler_data(desc); | 917 | struct ipu_soc *ipu = irq_desc_get_handler_data(desc); |
918 | struct irq_chip *chip = irq_desc_get_chip(desc); | 918 | struct irq_chip *chip = irq_desc_get_chip(desc); |
@@ -925,7 +925,7 @@ static void ipu_irq_handler(unsigned int irq, struct irq_desc *desc) | |||
925 | chained_irq_exit(chip, desc); | 925 | chained_irq_exit(chip, desc); |
926 | } | 926 | } |
927 | 927 | ||
928 | static void ipu_err_irq_handler(unsigned int irq, struct irq_desc *desc) | 928 | static void ipu_err_irq_handler(struct irq_desc *desc) |
929 | { | 929 | { |
930 | struct ipu_soc *ipu = irq_desc_get_handler_data(desc); | 930 | struct ipu_soc *ipu = irq_desc_get_handler_data(desc); |
931 | struct irq_chip *chip = irq_desc_get_chip(desc); | 931 | struct irq_chip *chip = irq_desc_get_chip(desc); |
diff --git a/drivers/irqchip/exynos-combiner.c b/drivers/irqchip/exynos-combiner.c index e9c6f2a5b52d..94ddc96f2f7d 100644 --- a/drivers/irqchip/exynos-combiner.c +++ b/drivers/irqchip/exynos-combiner.c | |||
@@ -65,12 +65,10 @@ static void combiner_unmask_irq(struct irq_data *data) | |||
65 | __raw_writel(mask, combiner_base(data) + COMBINER_ENABLE_SET); | 65 | __raw_writel(mask, combiner_base(data) + COMBINER_ENABLE_SET); |
66 | } | 66 | } |
67 | 67 | ||
68 | static void combiner_handle_cascade_irq(unsigned int __irq, | 68 | static void combiner_handle_cascade_irq(struct irq_desc *desc) |
69 | struct irq_desc *desc) | ||
70 | { | 69 | { |
71 | struct combiner_chip_data *chip_data = irq_desc_get_handler_data(desc); | 70 | struct combiner_chip_data *chip_data = irq_desc_get_handler_data(desc); |
72 | struct irq_chip *chip = irq_desc_get_chip(desc); | 71 | struct irq_chip *chip = irq_desc_get_chip(desc); |
73 | unsigned int irq = irq_desc_get_irq(desc); | ||
74 | unsigned int cascade_irq, combiner_irq; | 72 | unsigned int cascade_irq, combiner_irq; |
75 | unsigned long status; | 73 | unsigned long status; |
76 | 74 | ||
@@ -88,7 +86,7 @@ static void combiner_handle_cascade_irq(unsigned int __irq, | |||
88 | cascade_irq = irq_find_mapping(combiner_irq_domain, combiner_irq); | 86 | cascade_irq = irq_find_mapping(combiner_irq_domain, combiner_irq); |
89 | 87 | ||
90 | if (unlikely(!cascade_irq)) | 88 | if (unlikely(!cascade_irq)) |
91 | handle_bad_irq(irq, desc); | 89 | handle_bad_irq(desc); |
92 | else | 90 | else |
93 | generic_handle_irq(cascade_irq); | 91 | generic_handle_irq(cascade_irq); |
94 | 92 | ||
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index 39b72da0c143..693b9fb879bd 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c | |||
@@ -447,8 +447,7 @@ static void armada_370_xp_handle_msi_irq(struct pt_regs *regs, bool is_chained) | |||
447 | static void armada_370_xp_handle_msi_irq(struct pt_regs *r, bool b) {} | 447 | static void armada_370_xp_handle_msi_irq(struct pt_regs *r, bool b) {} |
448 | #endif | 448 | #endif |
449 | 449 | ||
450 | static void armada_370_xp_mpic_handle_cascade_irq(unsigned int irq, | 450 | static void armada_370_xp_mpic_handle_cascade_irq(struct irq_desc *desc) |
451 | struct irq_desc *desc) | ||
452 | { | 451 | { |
453 | struct irq_chip *chip = irq_desc_get_chip(desc); | 452 | struct irq_chip *chip = irq_desc_get_chip(desc); |
454 | unsigned long irqmap, irqn, irqsrc, cpuid; | 453 | unsigned long irqmap, irqn, irqsrc, cpuid; |
diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c index ed4ca9deca70..56c9cf488e6c 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c | |||
@@ -96,7 +96,7 @@ struct armctrl_ic { | |||
96 | static struct armctrl_ic intc __read_mostly; | 96 | static struct armctrl_ic intc __read_mostly; |
97 | static void __exception_irq_entry bcm2835_handle_irq( | 97 | static void __exception_irq_entry bcm2835_handle_irq( |
98 | struct pt_regs *regs); | 98 | struct pt_regs *regs); |
99 | static void bcm2836_chained_handle_irq(unsigned int irq, struct irq_desc *desc); | 99 | static void bcm2836_chained_handle_irq(struct irq_desc *desc); |
100 | 100 | ||
101 | static void armctrl_mask_irq(struct irq_data *d) | 101 | static void armctrl_mask_irq(struct irq_data *d) |
102 | { | 102 | { |
@@ -245,7 +245,7 @@ static void __exception_irq_entry bcm2835_handle_irq( | |||
245 | handle_IRQ(irq_linear_revmap(intc.domain, hwirq), regs); | 245 | handle_IRQ(irq_linear_revmap(intc.domain, hwirq), regs); |
246 | } | 246 | } |
247 | 247 | ||
248 | static void bcm2836_chained_handle_irq(unsigned int irq, struct irq_desc *desc) | 248 | static void bcm2836_chained_handle_irq(struct irq_desc *desc) |
249 | { | 249 | { |
250 | u32 hwirq; | 250 | u32 hwirq; |
251 | 251 | ||
diff --git a/drivers/irqchip/irq-bcm7038-l1.c b/drivers/irqchip/irq-bcm7038-l1.c index 409bdc6366c2..0fea985ef1dc 100644 --- a/drivers/irqchip/irq-bcm7038-l1.c +++ b/drivers/irqchip/irq-bcm7038-l1.c | |||
@@ -115,7 +115,7 @@ static inline void l1_writel(u32 val, void __iomem *reg) | |||
115 | writel(val, reg); | 115 | writel(val, reg); |
116 | } | 116 | } |
117 | 117 | ||
118 | static void bcm7038_l1_irq_handle(unsigned int irq, struct irq_desc *desc) | 118 | static void bcm7038_l1_irq_handle(struct irq_desc *desc) |
119 | { | 119 | { |
120 | struct bcm7038_l1_chip *intc = irq_desc_get_handler_data(desc); | 120 | struct bcm7038_l1_chip *intc = irq_desc_get_handler_data(desc); |
121 | struct bcm7038_l1_cpu *cpu; | 121 | struct bcm7038_l1_cpu *cpu; |
diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c index d3f976913a6f..61b18ab33ad9 100644 --- a/drivers/irqchip/irq-bcm7120-l2.c +++ b/drivers/irqchip/irq-bcm7120-l2.c | |||
@@ -56,7 +56,7 @@ struct bcm7120_l2_intc_data { | |||
56 | const __be32 *map_mask_prop; | 56 | const __be32 *map_mask_prop; |
57 | }; | 57 | }; |
58 | 58 | ||
59 | static void bcm7120_l2_intc_irq_handle(unsigned int irq, struct irq_desc *desc) | 59 | static void bcm7120_l2_intc_irq_handle(struct irq_desc *desc) |
60 | { | 60 | { |
61 | struct bcm7120_l1_intc_data *data = irq_desc_get_handler_data(desc); | 61 | struct bcm7120_l1_intc_data *data = irq_desc_get_handler_data(desc); |
62 | struct bcm7120_l2_intc_data *b = data->b; | 62 | struct bcm7120_l2_intc_data *b = data->b; |
diff --git a/drivers/irqchip/irq-brcmstb-l2.c b/drivers/irqchip/irq-brcmstb-l2.c index aedda06191eb..65cd341f331a 100644 --- a/drivers/irqchip/irq-brcmstb-l2.c +++ b/drivers/irqchip/irq-brcmstb-l2.c | |||
@@ -49,13 +49,12 @@ struct brcmstb_l2_intc_data { | |||
49 | u32 saved_mask; /* for suspend/resume */ | 49 | u32 saved_mask; /* for suspend/resume */ |
50 | }; | 50 | }; |
51 | 51 | ||
52 | static void brcmstb_l2_intc_irq_handle(unsigned int __irq, | 52 | static void brcmstb_l2_intc_irq_handle(struct irq_desc *desc) |
53 | struct irq_desc *desc) | ||
54 | { | 53 | { |
55 | struct brcmstb_l2_intc_data *b = irq_desc_get_handler_data(desc); | 54 | struct brcmstb_l2_intc_data *b = irq_desc_get_handler_data(desc); |
56 | struct irq_chip_generic *gc = irq_get_domain_generic_chip(b->domain, 0); | 55 | struct irq_chip_generic *gc = irq_get_domain_generic_chip(b->domain, 0); |
57 | struct irq_chip *chip = irq_desc_get_chip(desc); | 56 | struct irq_chip *chip = irq_desc_get_chip(desc); |
58 | unsigned int irq = irq_desc_get_irq(desc); | 57 | unsigned int irq; |
59 | u32 status; | 58 | u32 status; |
60 | 59 | ||
61 | chained_irq_enter(chip, desc); | 60 | chained_irq_enter(chip, desc); |
@@ -65,7 +64,7 @@ static void brcmstb_l2_intc_irq_handle(unsigned int __irq, | |||
65 | 64 | ||
66 | if (status == 0) { | 65 | if (status == 0) { |
67 | raw_spin_lock(&desc->lock); | 66 | raw_spin_lock(&desc->lock); |
68 | handle_bad_irq(irq, desc); | 67 | handle_bad_irq(desc); |
69 | raw_spin_unlock(&desc->lock); | 68 | raw_spin_unlock(&desc->lock); |
70 | goto out; | 69 | goto out; |
71 | } | 70 | } |
diff --git a/drivers/irqchip/irq-dw-apb-ictl.c b/drivers/irqchip/irq-dw-apb-ictl.c index efd95d9955e7..052f266364c0 100644 --- a/drivers/irqchip/irq-dw-apb-ictl.c +++ b/drivers/irqchip/irq-dw-apb-ictl.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #define APB_INT_FINALSTATUS_H 0x34 | 26 | #define APB_INT_FINALSTATUS_H 0x34 |
27 | #define APB_INT_BASE_OFFSET 0x04 | 27 | #define APB_INT_BASE_OFFSET 0x04 |
28 | 28 | ||
29 | static void dw_apb_ictl_handler(unsigned int irq, struct irq_desc *desc) | 29 | static void dw_apb_ictl_handler(struct irq_desc *desc) |
30 | { | 30 | { |
31 | struct irq_domain *d = irq_desc_get_handler_data(desc); | 31 | struct irq_domain *d = irq_desc_get_handler_data(desc); |
32 | struct irq_chip *chip = irq_desc_get_chip(desc); | 32 | struct irq_chip *chip = irq_desc_get_chip(desc); |
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 9bccdd295769..00bb7c05a55e 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c | |||
@@ -341,7 +341,7 @@ static void __exception_irq_entry gic_handle_irq(struct pt_regs *regs) | |||
341 | } while (1); | 341 | } while (1); |
342 | } | 342 | } |
343 | 343 | ||
344 | static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc) | 344 | static void gic_handle_cascade_irq(struct irq_desc *desc) |
345 | { | 345 | { |
346 | struct gic_chip_data *chip_data = irq_desc_get_handler_data(desc); | 346 | struct gic_chip_data *chip_data = irq_desc_get_handler_data(desc); |
347 | struct irq_chip *chip = irq_desc_get_chip(desc); | 347 | struct irq_chip *chip = irq_desc_get_chip(desc); |
@@ -360,7 +360,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc) | |||
360 | 360 | ||
361 | cascade_irq = irq_find_mapping(chip_data->domain, gic_irq); | 361 | cascade_irq = irq_find_mapping(chip_data->domain, gic_irq); |
362 | if (unlikely(gic_irq < 32 || gic_irq > 1020)) | 362 | if (unlikely(gic_irq < 32 || gic_irq > 1020)) |
363 | handle_bad_irq(cascade_irq, desc); | 363 | handle_bad_irq(desc); |
364 | else | 364 | else |
365 | generic_handle_irq(cascade_irq); | 365 | generic_handle_irq(cascade_irq); |
366 | 366 | ||
diff --git a/drivers/irqchip/irq-i8259.c b/drivers/irqchip/irq-i8259.c index 4836102ba312..e484fd255321 100644 --- a/drivers/irqchip/irq-i8259.c +++ b/drivers/irqchip/irq-i8259.c | |||
@@ -352,7 +352,7 @@ void __init init_i8259_irqs(void) | |||
352 | __init_i8259_irqs(NULL); | 352 | __init_i8259_irqs(NULL); |
353 | } | 353 | } |
354 | 354 | ||
355 | static void i8259_irq_dispatch(unsigned int __irq, struct irq_desc *desc) | 355 | static void i8259_irq_dispatch(struct irq_desc *desc) |
356 | { | 356 | { |
357 | struct irq_domain *domain = irq_desc_get_handler_data(desc); | 357 | struct irq_domain *domain = irq_desc_get_handler_data(desc); |
358 | int hwirq = i8259_irq(); | 358 | int hwirq = i8259_irq(); |
diff --git a/drivers/irqchip/irq-imgpdc.c b/drivers/irqchip/irq-imgpdc.c index 841604b81004..c02d29c9dc05 100644 --- a/drivers/irqchip/irq-imgpdc.c +++ b/drivers/irqchip/irq-imgpdc.c | |||
@@ -218,7 +218,7 @@ static int pdc_irq_set_wake(struct irq_data *data, unsigned int on) | |||
218 | return 0; | 218 | return 0; |
219 | } | 219 | } |
220 | 220 | ||
221 | static void pdc_intc_perip_isr(unsigned int __irq, struct irq_desc *desc) | 221 | static void pdc_intc_perip_isr(struct irq_desc *desc) |
222 | { | 222 | { |
223 | unsigned int irq = irq_desc_get_irq(desc); | 223 | unsigned int irq = irq_desc_get_irq(desc); |
224 | struct pdc_intc_priv *priv; | 224 | struct pdc_intc_priv *priv; |
@@ -240,7 +240,7 @@ found: | |||
240 | generic_handle_irq(irq_no); | 240 | generic_handle_irq(irq_no); |
241 | } | 241 | } |
242 | 242 | ||
243 | static void pdc_intc_syswake_isr(unsigned int irq, struct irq_desc *desc) | 243 | static void pdc_intc_syswake_isr(struct irq_desc *desc) |
244 | { | 244 | { |
245 | struct pdc_intc_priv *priv; | 245 | struct pdc_intc_priv *priv; |
246 | unsigned int syswake, irq_no; | 246 | unsigned int syswake, irq_no; |
diff --git a/drivers/irqchip/irq-keystone.c b/drivers/irqchip/irq-keystone.c index c1517267b5db..7b784b692f3c 100644 --- a/drivers/irqchip/irq-keystone.c +++ b/drivers/irqchip/irq-keystone.c | |||
@@ -83,7 +83,7 @@ static void keystone_irq_ack(struct irq_data *d) | |||
83 | /* nothing to do here */ | 83 | /* nothing to do here */ |
84 | } | 84 | } |
85 | 85 | ||
86 | static void keystone_irq_handler(unsigned __irq, struct irq_desc *desc) | 86 | static void keystone_irq_handler(struct irq_desc *desc) |
87 | { | 87 | { |
88 | unsigned int irq = irq_desc_get_irq(desc); | 88 | unsigned int irq = irq_desc_get_irq(desc); |
89 | struct keystone_irq_device *kirq = irq_desc_get_handler_data(desc); | 89 | struct keystone_irq_device *kirq = irq_desc_get_handler_data(desc); |
diff --git a/drivers/irqchip/irq-metag-ext.c b/drivers/irqchip/irq-metag-ext.c index 5f4c52928d16..8c38b3d92e1c 100644 --- a/drivers/irqchip/irq-metag-ext.c +++ b/drivers/irqchip/irq-metag-ext.c | |||
@@ -446,7 +446,7 @@ static int meta_intc_irq_set_type(struct irq_data *data, unsigned int flow_type) | |||
446 | * Whilst using TR2 to detect external interrupts is a software convention it is | 446 | * Whilst using TR2 to detect external interrupts is a software convention it is |
447 | * (hopefully) unlikely to change. | 447 | * (hopefully) unlikely to change. |
448 | */ | 448 | */ |
449 | static void meta_intc_irq_demux(unsigned int irq, struct irq_desc *desc) | 449 | static void meta_intc_irq_demux(struct irq_desc *desc) |
450 | { | 450 | { |
451 | struct meta_intc_priv *priv = &meta_intc_priv; | 451 | struct meta_intc_priv *priv = &meta_intc_priv; |
452 | irq_hw_number_t hw; | 452 | irq_hw_number_t hw; |
diff --git a/drivers/irqchip/irq-metag.c b/drivers/irqchip/irq-metag.c index 3d23ce3edb5c..a5f053bd2f44 100644 --- a/drivers/irqchip/irq-metag.c +++ b/drivers/irqchip/irq-metag.c | |||
@@ -220,7 +220,7 @@ static int metag_internal_irq_set_affinity(struct irq_data *data, | |||
220 | * occurred. It is this function's job to demux this irq and | 220 | * occurred. It is this function's job to demux this irq and |
221 | * figure out exactly which trigger needs servicing. | 221 | * figure out exactly which trigger needs servicing. |
222 | */ | 222 | */ |
223 | static void metag_internal_irq_demux(unsigned int irq, struct irq_desc *desc) | 223 | static void metag_internal_irq_demux(struct irq_desc *desc) |
224 | { | 224 | { |
225 | struct metag_internal_irq_priv *priv = irq_desc_get_handler_data(desc); | 225 | struct metag_internal_irq_priv *priv = irq_desc_get_handler_data(desc); |
226 | irq_hw_number_t hw; | 226 | irq_hw_number_t hw; |
diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c index 1764bcf8ee6b..af2f16bb8a94 100644 --- a/drivers/irqchip/irq-mips-gic.c +++ b/drivers/irqchip/irq-mips-gic.c | |||
@@ -546,7 +546,7 @@ static void __gic_irq_dispatch(void) | |||
546 | gic_handle_shared_int(false); | 546 | gic_handle_shared_int(false); |
547 | } | 547 | } |
548 | 548 | ||
549 | static void gic_irq_dispatch(unsigned int irq, struct irq_desc *desc) | 549 | static void gic_irq_dispatch(struct irq_desc *desc) |
550 | { | 550 | { |
551 | gic_handle_local_int(true); | 551 | gic_handle_local_int(true); |
552 | gic_handle_shared_int(true); | 552 | gic_handle_shared_int(true); |
diff --git a/drivers/irqchip/irq-mmp.c b/drivers/irqchip/irq-mmp.c index 781ed6e71dbb..ea6e3a96f3b3 100644 --- a/drivers/irqchip/irq-mmp.c +++ b/drivers/irqchip/irq-mmp.c | |||
@@ -129,7 +129,7 @@ struct irq_chip icu_irq_chip = { | |||
129 | .irq_unmask = icu_unmask_irq, | 129 | .irq_unmask = icu_unmask_irq, |
130 | }; | 130 | }; |
131 | 131 | ||
132 | static void icu_mux_irq_demux(unsigned int __irq, struct irq_desc *desc) | 132 | static void icu_mux_irq_demux(struct irq_desc *desc) |
133 | { | 133 | { |
134 | unsigned int irq = irq_desc_get_irq(desc); | 134 | unsigned int irq = irq_desc_get_irq(desc); |
135 | struct irq_domain *domain; | 135 | struct irq_domain *domain; |
diff --git a/drivers/irqchip/irq-orion.c b/drivers/irqchip/irq-orion.c index 5ea999a724b5..be4c5a8c9659 100644 --- a/drivers/irqchip/irq-orion.c +++ b/drivers/irqchip/irq-orion.c | |||
@@ -106,7 +106,7 @@ IRQCHIP_DECLARE(orion_intc, "marvell,orion-intc", orion_irq_init); | |||
106 | #define ORION_BRIDGE_IRQ_CAUSE 0x00 | 106 | #define ORION_BRIDGE_IRQ_CAUSE 0x00 |
107 | #define ORION_BRIDGE_IRQ_MASK 0x04 | 107 | #define ORION_BRIDGE_IRQ_MASK 0x04 |
108 | 108 | ||
109 | static void orion_bridge_irq_handler(unsigned int irq, struct irq_desc *desc) | 109 | static void orion_bridge_irq_handler(struct irq_desc *desc) |
110 | { | 110 | { |
111 | struct irq_domain *d = irq_desc_get_handler_data(desc); | 111 | struct irq_domain *d = irq_desc_get_handler_data(desc); |
112 | 112 | ||
diff --git a/drivers/irqchip/irq-s3c24xx.c b/drivers/irqchip/irq-s3c24xx.c index 506d9f20ca51..e47572a9bbb2 100644 --- a/drivers/irqchip/irq-s3c24xx.c +++ b/drivers/irqchip/irq-s3c24xx.c | |||
@@ -298,7 +298,7 @@ static struct irq_chip s3c_irq_eint0t4 = { | |||
298 | .irq_set_type = s3c_irqext0_type, | 298 | .irq_set_type = s3c_irqext0_type, |
299 | }; | 299 | }; |
300 | 300 | ||
301 | static void s3c_irq_demux(unsigned int __irq, struct irq_desc *desc) | 301 | static void s3c_irq_demux(struct irq_desc *desc) |
302 | { | 302 | { |
303 | struct irq_chip *chip = irq_desc_get_chip(desc); | 303 | struct irq_chip *chip = irq_desc_get_chip(desc); |
304 | struct s3c_irq_data *irq_data = irq_desc_get_chip_data(desc); | 304 | struct s3c_irq_data *irq_data = irq_desc_get_chip_data(desc); |
diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c index 772a82cacbf7..c143dd58410c 100644 --- a/drivers/irqchip/irq-sunxi-nmi.c +++ b/drivers/irqchip/irq-sunxi-nmi.c | |||
@@ -58,7 +58,7 @@ static inline u32 sunxi_sc_nmi_read(struct irq_chip_generic *gc, u32 off) | |||
58 | return irq_reg_readl(gc, off); | 58 | return irq_reg_readl(gc, off); |
59 | } | 59 | } |
60 | 60 | ||
61 | static void sunxi_sc_nmi_handle_irq(unsigned int irq, struct irq_desc *desc) | 61 | static void sunxi_sc_nmi_handle_irq(struct irq_desc *desc) |
62 | { | 62 | { |
63 | struct irq_domain *domain = irq_desc_get_handler_data(desc); | 63 | struct irq_domain *domain = irq_desc_get_handler_data(desc); |
64 | struct irq_chip *chip = irq_desc_get_chip(desc); | 64 | struct irq_chip *chip = irq_desc_get_chip(desc); |
diff --git a/drivers/irqchip/irq-tb10x.c b/drivers/irqchip/irq-tb10x.c index 331829661366..848d782a2a3b 100644 --- a/drivers/irqchip/irq-tb10x.c +++ b/drivers/irqchip/irq-tb10x.c | |||
@@ -97,7 +97,7 @@ static int tb10x_irq_set_type(struct irq_data *data, unsigned int flow_type) | |||
97 | return IRQ_SET_MASK_OK; | 97 | return IRQ_SET_MASK_OK; |
98 | } | 98 | } |
99 | 99 | ||
100 | static void tb10x_irq_cascade(unsigned int __irq, struct irq_desc *desc) | 100 | static void tb10x_irq_cascade(struct irq_desc *desc) |
101 | { | 101 | { |
102 | struct irq_domain *domain = irq_desc_get_handler_data(desc); | 102 | struct irq_domain *domain = irq_desc_get_handler_data(desc); |
103 | unsigned int irq = irq_desc_get_irq(desc); | 103 | unsigned int irq = irq_desc_get_irq(desc); |
diff --git a/drivers/irqchip/irq-versatile-fpga.c b/drivers/irqchip/irq-versatile-fpga.c index 16123f688768..1b1c63e8d249 100644 --- a/drivers/irqchip/irq-versatile-fpga.c +++ b/drivers/irqchip/irq-versatile-fpga.c | |||
@@ -65,19 +65,19 @@ static void fpga_irq_unmask(struct irq_data *d) | |||
65 | writel(mask, f->base + IRQ_ENABLE_SET); | 65 | writel(mask, f->base + IRQ_ENABLE_SET); |
66 | } | 66 | } |
67 | 67 | ||
68 | static void fpga_irq_handle(unsigned int __irq, struct irq_desc *desc) | 68 | static void fpga_irq_handle(struct irq_desc *desc) |
69 | { | 69 | { |
70 | struct fpga_irq_data *f = irq_desc_get_handler_data(desc); | 70 | struct fpga_irq_data *f = irq_desc_get_handler_data(desc); |
71 | unsigned int irq = irq_desc_get_irq(desc); | ||
72 | u32 status = readl(f->base + IRQ_STATUS); | 71 | u32 status = readl(f->base + IRQ_STATUS); |
73 | 72 | ||
74 | if (status == 0) { | 73 | if (status == 0) { |
75 | do_bad_IRQ(irq, desc); | 74 | do_bad_IRQ(desc); |
76 | return; | 75 | return; |
77 | } | 76 | } |
78 | 77 | ||
79 | do { | 78 | do { |
80 | irq = ffs(status) - 1; | 79 | unsigned int irq = ffs(status) - 1; |
80 | |||
81 | status &= ~(1 << irq); | 81 | status &= ~(1 << irq); |
82 | generic_handle_irq(irq_find_mapping(f->domain, irq)); | 82 | generic_handle_irq(irq_find_mapping(f->domain, irq)); |
83 | } while (status); | 83 | } while (status); |
diff --git a/drivers/irqchip/irq-vic.c b/drivers/irqchip/irq-vic.c index 03846dff4212..cb85504c2ff1 100644 --- a/drivers/irqchip/irq-vic.c +++ b/drivers/irqchip/irq-vic.c | |||
@@ -225,7 +225,7 @@ static int handle_one_vic(struct vic_device *vic, struct pt_regs *regs) | |||
225 | return handled; | 225 | return handled; |
226 | } | 226 | } |
227 | 227 | ||
228 | static void vic_handle_irq_cascaded(unsigned int irq, struct irq_desc *desc) | 228 | static void vic_handle_irq_cascaded(struct irq_desc *desc) |
229 | { | 229 | { |
230 | u32 stat, hwirq; | 230 | u32 stat, hwirq; |
231 | struct irq_chip *host_chip = irq_desc_get_chip(desc); | 231 | struct irq_chip *host_chip = irq_desc_get_chip(desc); |
diff --git a/drivers/irqchip/spear-shirq.c b/drivers/irqchip/spear-shirq.c index 4cbd9c5dc1e6..c838c9286ea5 100644 --- a/drivers/irqchip/spear-shirq.c +++ b/drivers/irqchip/spear-shirq.c | |||
@@ -182,7 +182,7 @@ static struct spear_shirq *spear320_shirq_blocks[] = { | |||
182 | &spear320_shirq_intrcomm_ras, | 182 | &spear320_shirq_intrcomm_ras, |
183 | }; | 183 | }; |
184 | 184 | ||
185 | static void shirq_handler(unsigned __irq, struct irq_desc *desc) | 185 | static void shirq_handler(struct irq_desc *desc) |
186 | { | 186 | { |
187 | struct spear_shirq *shirq = irq_desc_get_handler_data(desc); | 187 | struct spear_shirq *shirq = irq_desc_get_handler_data(desc); |
188 | u32 pend; | 188 | u32 pend; |
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c index 4b54128bc78e..a726f01e3b02 100644 --- a/drivers/mfd/asic3.c +++ b/drivers/mfd/asic3.c | |||
@@ -138,7 +138,7 @@ static void asic3_irq_flip_edge(struct asic3 *asic, | |||
138 | spin_unlock_irqrestore(&asic->lock, flags); | 138 | spin_unlock_irqrestore(&asic->lock, flags); |
139 | } | 139 | } |
140 | 140 | ||
141 | static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc) | 141 | static void asic3_irq_demux(struct irq_desc *desc) |
142 | { | 142 | { |
143 | struct asic3 *asic = irq_desc_get_handler_data(desc); | 143 | struct asic3 *asic = irq_desc_get_handler_data(desc); |
144 | struct irq_data *data = irq_desc_get_irq_data(desc); | 144 | struct irq_data *data = irq_desc_get_irq_data(desc); |
diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c index a76eb6ef47a0..b279205659a4 100644 --- a/drivers/mfd/ezx-pcap.c +++ b/drivers/mfd/ezx-pcap.c | |||
@@ -205,7 +205,7 @@ static void pcap_isr_work(struct work_struct *work) | |||
205 | } while (gpio_get_value(pdata->gpio)); | 205 | } while (gpio_get_value(pdata->gpio)); |
206 | } | 206 | } |
207 | 207 | ||
208 | static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc) | 208 | static void pcap_irq_handler(struct irq_desc *desc) |
209 | { | 209 | { |
210 | struct pcap_chip *pcap = irq_desc_get_handler_data(desc); | 210 | struct pcap_chip *pcap = irq_desc_get_handler_data(desc); |
211 | 211 | ||
diff --git a/drivers/mfd/htc-egpio.c b/drivers/mfd/htc-egpio.c index 9131cdcdc64a..6ccaf90d98fd 100644 --- a/drivers/mfd/htc-egpio.c +++ b/drivers/mfd/htc-egpio.c | |||
@@ -98,7 +98,7 @@ static struct irq_chip egpio_muxed_chip = { | |||
98 | .irq_unmask = egpio_unmask, | 98 | .irq_unmask = egpio_unmask, |
99 | }; | 99 | }; |
100 | 100 | ||
101 | static void egpio_handler(unsigned int irq, struct irq_desc *desc) | 101 | static void egpio_handler(struct irq_desc *desc) |
102 | { | 102 | { |
103 | struct egpio_info *ei = irq_desc_get_handler_data(desc); | 103 | struct egpio_info *ei = irq_desc_get_handler_data(desc); |
104 | int irqpin; | 104 | int irqpin; |
diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c index 5bb49f08955d..798e44306382 100644 --- a/drivers/mfd/jz4740-adc.c +++ b/drivers/mfd/jz4740-adc.c | |||
@@ -65,7 +65,7 @@ struct jz4740_adc { | |||
65 | spinlock_t lock; | 65 | spinlock_t lock; |
66 | }; | 66 | }; |
67 | 67 | ||
68 | static void jz4740_adc_irq_demux(unsigned int irq, struct irq_desc *desc) | 68 | static void jz4740_adc_irq_demux(struct irq_desc *desc) |
69 | { | 69 | { |
70 | struct irq_chip_generic *gc = irq_desc_get_handler_data(desc); | 70 | struct irq_chip_generic *gc = irq_desc_get_handler_data(desc); |
71 | uint8_t status; | 71 | uint8_t status; |
diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c index 59502d02cd15..1b7ec0870c2a 100644 --- a/drivers/mfd/pm8921-core.c +++ b/drivers/mfd/pm8921-core.c | |||
@@ -156,7 +156,7 @@ static int pm8xxx_irq_master_handler(struct pm_irq_chip *chip, int master) | |||
156 | return ret; | 156 | return ret; |
157 | } | 157 | } |
158 | 158 | ||
159 | static void pm8xxx_irq_handler(unsigned int irq, struct irq_desc *desc) | 159 | static void pm8xxx_irq_handler(struct irq_desc *desc) |
160 | { | 160 | { |
161 | struct pm_irq_chip *chip = irq_desc_get_handler_data(desc); | 161 | struct pm_irq_chip *chip = irq_desc_get_handler_data(desc); |
162 | struct irq_chip *irq_chip = irq_desc_get_chip(desc); | 162 | struct irq_chip *irq_chip = irq_desc_get_chip(desc); |
diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c index 16fc1adc4fa3..94bd89cb1f06 100644 --- a/drivers/mfd/t7l66xb.c +++ b/drivers/mfd/t7l66xb.c | |||
@@ -185,7 +185,7 @@ static struct mfd_cell t7l66xb_cells[] = { | |||
185 | /*--------------------------------------------------------------------------*/ | 185 | /*--------------------------------------------------------------------------*/ |
186 | 186 | ||
187 | /* Handle the T7L66XB interrupt mux */ | 187 | /* Handle the T7L66XB interrupt mux */ |
188 | static void t7l66xb_irq(unsigned int irq, struct irq_desc *desc) | 188 | static void t7l66xb_irq(struct irq_desc *desc) |
189 | { | 189 | { |
190 | struct t7l66xb *t7l66xb = irq_desc_get_handler_data(desc); | 190 | struct t7l66xb *t7l66xb = irq_desc_get_handler_data(desc); |
191 | unsigned int isr; | 191 | unsigned int isr; |
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c index 775b9aca871a..8c84a513016b 100644 --- a/drivers/mfd/tc6393xb.c +++ b/drivers/mfd/tc6393xb.c | |||
@@ -522,8 +522,7 @@ static int tc6393xb_register_gpio(struct tc6393xb *tc6393xb, int gpio_base) | |||
522 | 522 | ||
523 | /*--------------------------------------------------------------------------*/ | 523 | /*--------------------------------------------------------------------------*/ |
524 | 524 | ||
525 | static void | 525 | static void tc6393xb_irq(struct irq_desc *desc) |
526 | tc6393xb_irq(unsigned int irq, struct irq_desc *desc) | ||
527 | { | 526 | { |
528 | struct tc6393xb *tc6393xb = irq_desc_get_handler_data(desc); | 527 | struct tc6393xb *tc6393xb = irq_desc_get_handler_data(desc); |
529 | unsigned int isr; | 528 | unsigned int isr; |
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c index 9a2302129711..f691d7ecad52 100644 --- a/drivers/mfd/ucb1x00-core.c +++ b/drivers/mfd/ucb1x00-core.c | |||
@@ -282,7 +282,7 @@ void ucb1x00_adc_disable(struct ucb1x00 *ucb) | |||
282 | * SIBCLK to talk to the chip. We leave the clock running until | 282 | * SIBCLK to talk to the chip. We leave the clock running until |
283 | * we have finished processing all interrupts from the chip. | 283 | * we have finished processing all interrupts from the chip. |
284 | */ | 284 | */ |
285 | static void ucb1x00_irq(unsigned int __irq, struct irq_desc *desc) | 285 | static void ucb1x00_irq(struct irq_desc *desc) |
286 | { | 286 | { |
287 | struct ucb1x00 *ucb = irq_desc_get_handler_data(desc); | 287 | struct ucb1x00 *ucb = irq_desc_get_handler_data(desc); |
288 | unsigned int isr, i; | 288 | unsigned int isr, i; |
diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c index 81253e70b1c5..0aa81bd3de12 100644 --- a/drivers/pci/host/pci-keystone.c +++ b/drivers/pci/host/pci-keystone.c | |||
@@ -110,7 +110,7 @@ static int ks_pcie_establish_link(struct keystone_pcie *ks_pcie) | |||
110 | return -EINVAL; | 110 | return -EINVAL; |
111 | } | 111 | } |
112 | 112 | ||
113 | static void ks_pcie_msi_irq_handler(unsigned int __irq, struct irq_desc *desc) | 113 | static void ks_pcie_msi_irq_handler(struct irq_desc *desc) |
114 | { | 114 | { |
115 | unsigned int irq = irq_desc_get_irq(desc); | 115 | unsigned int irq = irq_desc_get_irq(desc); |
116 | struct keystone_pcie *ks_pcie = irq_desc_get_handler_data(desc); | 116 | struct keystone_pcie *ks_pcie = irq_desc_get_handler_data(desc); |
@@ -138,8 +138,7 @@ static void ks_pcie_msi_irq_handler(unsigned int __irq, struct irq_desc *desc) | |||
138 | * Traverse through pending legacy interrupts and invoke handler for each. Also | 138 | * Traverse through pending legacy interrupts and invoke handler for each. Also |
139 | * takes care of interrupt controller level mask/ack operation. | 139 | * takes care of interrupt controller level mask/ack operation. |
140 | */ | 140 | */ |
141 | static void ks_pcie_legacy_irq_handler(unsigned int __irq, | 141 | static void ks_pcie_legacy_irq_handler(struct irq_desc *desc) |
142 | struct irq_desc *desc) | ||
143 | { | 142 | { |
144 | unsigned int irq = irq_desc_get_irq(desc); | 143 | unsigned int irq = irq_desc_get_irq(desc); |
145 | struct keystone_pcie *ks_pcie = irq_desc_get_handler_data(desc); | 144 | struct keystone_pcie *ks_pcie = irq_desc_get_handler_data(desc); |
diff --git a/drivers/pci/host/pci-xgene-msi.c b/drivers/pci/host/pci-xgene-msi.c index 996327cfa1e1..e491681daf22 100644 --- a/drivers/pci/host/pci-xgene-msi.c +++ b/drivers/pci/host/pci-xgene-msi.c | |||
@@ -295,7 +295,7 @@ static int xgene_msi_init_allocator(struct xgene_msi *xgene_msi) | |||
295 | return 0; | 295 | return 0; |
296 | } | 296 | } |
297 | 297 | ||
298 | static void xgene_msi_isr(unsigned int irq, struct irq_desc *desc) | 298 | static void xgene_msi_isr(struct irq_desc *desc) |
299 | { | 299 | { |
300 | struct irq_chip *chip = irq_desc_get_chip(desc); | 300 | struct irq_chip *chip = irq_desc_get_chip(desc); |
301 | struct xgene_msi_group *msi_groups; | 301 | struct xgene_msi_group *msi_groups; |
diff --git a/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c b/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c index 7d9482bf8252..1ca783098e47 100644 --- a/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c +++ b/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c | |||
@@ -143,7 +143,7 @@ static inline bool cygnus_get_bit(struct cygnus_gpio *chip, unsigned int reg, | |||
143 | return !!(readl(chip->base + offset) & BIT(shift)); | 143 | return !!(readl(chip->base + offset) & BIT(shift)); |
144 | } | 144 | } |
145 | 145 | ||
146 | static void cygnus_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) | 146 | static void cygnus_gpio_irq_handler(struct irq_desc *desc) |
147 | { | 147 | { |
148 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); | 148 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); |
149 | struct cygnus_gpio *chip = to_cygnus_gpio(gc); | 149 | struct cygnus_gpio *chip = to_cygnus_gpio(gc); |
diff --git a/drivers/pinctrl/intel/pinctrl-baytrail.c b/drivers/pinctrl/intel/pinctrl-baytrail.c index dac4865f3203..f79ea430f651 100644 --- a/drivers/pinctrl/intel/pinctrl-baytrail.c +++ b/drivers/pinctrl/intel/pinctrl-baytrail.c | |||
@@ -425,7 +425,7 @@ static void byt_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) | |||
425 | } | 425 | } |
426 | } | 426 | } |
427 | 427 | ||
428 | static void byt_gpio_irq_handler(unsigned irq, struct irq_desc *desc) | 428 | static void byt_gpio_irq_handler(struct irq_desc *desc) |
429 | { | 429 | { |
430 | struct irq_data *data = irq_desc_get_irq_data(desc); | 430 | struct irq_data *data = irq_desc_get_irq_data(desc); |
431 | struct byt_gpio *vg = to_byt_gpio(irq_desc_get_handler_data(desc)); | 431 | struct byt_gpio *vg = to_byt_gpio(irq_desc_get_handler_data(desc)); |
diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c index 2d5d3ddc36e5..270c127e03ea 100644 --- a/drivers/pinctrl/intel/pinctrl-cherryview.c +++ b/drivers/pinctrl/intel/pinctrl-cherryview.c | |||
@@ -1414,7 +1414,7 @@ static struct irq_chip chv_gpio_irqchip = { | |||
1414 | .flags = IRQCHIP_SKIP_SET_WAKE, | 1414 | .flags = IRQCHIP_SKIP_SET_WAKE, |
1415 | }; | 1415 | }; |
1416 | 1416 | ||
1417 | static void chv_gpio_irq_handler(unsigned irq, struct irq_desc *desc) | 1417 | static void chv_gpio_irq_handler(struct irq_desc *desc) |
1418 | { | 1418 | { |
1419 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); | 1419 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); |
1420 | struct chv_pinctrl *pctrl = gpiochip_to_pinctrl(gc); | 1420 | struct chv_pinctrl *pctrl = gpiochip_to_pinctrl(gc); |
diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c index bb377c110541..54848b8decef 100644 --- a/drivers/pinctrl/intel/pinctrl-intel.c +++ b/drivers/pinctrl/intel/pinctrl-intel.c | |||
@@ -836,7 +836,7 @@ static void intel_gpio_community_irq_handler(struct gpio_chip *gc, | |||
836 | } | 836 | } |
837 | } | 837 | } |
838 | 838 | ||
839 | static void intel_gpio_irq_handler(unsigned irq, struct irq_desc *desc) | 839 | static void intel_gpio_irq_handler(struct irq_desc *desc) |
840 | { | 840 | { |
841 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); | 841 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); |
842 | struct intel_pinctrl *pctrl = gpiochip_to_pinctrl(gc); | 842 | struct intel_pinctrl *pctrl = gpiochip_to_pinctrl(gc); |
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c index 7726c6caaf83..1b22f96ba839 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c | |||
@@ -1190,7 +1190,7 @@ mtk_eint_debounce_process(struct mtk_pinctrl *pctl, int index) | |||
1190 | } | 1190 | } |
1191 | } | 1191 | } |
1192 | 1192 | ||
1193 | static void mtk_eint_irq_handler(unsigned irq, struct irq_desc *desc) | 1193 | static void mtk_eint_irq_handler(struct irq_desc *desc) |
1194 | { | 1194 | { |
1195 | struct irq_chip *chip = irq_desc_get_chip(desc); | 1195 | struct irq_chip *chip = irq_desc_get_chip(desc); |
1196 | struct mtk_pinctrl *pctl = irq_desc_get_handler_data(desc); | 1196 | struct mtk_pinctrl *pctl = irq_desc_get_handler_data(desc); |
diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c index 352ede13a9e9..96cf03908e93 100644 --- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c | |||
@@ -860,7 +860,7 @@ static void __nmk_gpio_irq_handler(struct irq_desc *desc, u32 status) | |||
860 | chained_irq_exit(host_chip, desc); | 860 | chained_irq_exit(host_chip, desc); |
861 | } | 861 | } |
862 | 862 | ||
863 | static void nmk_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) | 863 | static void nmk_gpio_irq_handler(struct irq_desc *desc) |
864 | { | 864 | { |
865 | struct gpio_chip *chip = irq_desc_get_handler_data(desc); | 865 | struct gpio_chip *chip = irq_desc_get_handler_data(desc); |
866 | struct nmk_gpio_chip *nmk_chip = container_of(chip, struct nmk_gpio_chip, chip); | 866 | struct nmk_gpio_chip *nmk_chip = container_of(chip, struct nmk_gpio_chip, chip); |
@@ -873,7 +873,7 @@ static void nmk_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) | |||
873 | __nmk_gpio_irq_handler(desc, status); | 873 | __nmk_gpio_irq_handler(desc, status); |
874 | } | 874 | } |
875 | 875 | ||
876 | static void nmk_gpio_latent_irq_handler(unsigned int irq, struct irq_desc *desc) | 876 | static void nmk_gpio_latent_irq_handler(struct irq_desc *desc) |
877 | { | 877 | { |
878 | struct gpio_chip *chip = irq_desc_get_handler_data(desc); | 878 | struct gpio_chip *chip = irq_desc_get_handler_data(desc); |
879 | struct nmk_gpio_chip *nmk_chip = container_of(chip, struct nmk_gpio_chip, chip); | 879 | struct nmk_gpio_chip *nmk_chip = container_of(chip, struct nmk_gpio_chip, chip); |
diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c index a5976ebc4482..f6be68518c87 100644 --- a/drivers/pinctrl/pinctrl-adi2.c +++ b/drivers/pinctrl/pinctrl-adi2.c | |||
@@ -530,8 +530,7 @@ static inline void preflow_handler(struct irq_desc *desc) | |||
530 | static inline void preflow_handler(struct irq_desc *desc) { } | 530 | static inline void preflow_handler(struct irq_desc *desc) { } |
531 | #endif | 531 | #endif |
532 | 532 | ||
533 | static void adi_gpio_handle_pint_irq(unsigned int inta_irq, | 533 | static void adi_gpio_handle_pint_irq(struct irq_desc *desc) |
534 | struct irq_desc *desc) | ||
535 | { | 534 | { |
536 | u32 request; | 535 | u32 request; |
537 | u32 level_mask, hwirq; | 536 | u32 level_mask, hwirq; |
diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c index 5e86bb8ca80e..3318f1d6193c 100644 --- a/drivers/pinctrl/pinctrl-amd.c +++ b/drivers/pinctrl/pinctrl-amd.c | |||
@@ -492,15 +492,15 @@ static struct irq_chip amd_gpio_irqchip = { | |||
492 | .irq_set_type = amd_gpio_irq_set_type, | 492 | .irq_set_type = amd_gpio_irq_set_type, |
493 | }; | 493 | }; |
494 | 494 | ||
495 | static void amd_gpio_irq_handler(unsigned int __irq, struct irq_desc *desc) | 495 | static void amd_gpio_irq_handler(struct irq_desc *desc) |
496 | { | 496 | { |
497 | unsigned int irq = irq_desc_get_irq(desc); | ||
498 | u32 i; | 497 | u32 i; |
499 | u32 off; | 498 | u32 off; |
500 | u32 reg; | 499 | u32 reg; |
501 | u32 pin_reg; | 500 | u32 pin_reg; |
502 | u64 reg64; | 501 | u64 reg64; |
503 | int handled = 0; | 502 | int handled = 0; |
503 | unsigned int irq; | ||
504 | unsigned long flags; | 504 | unsigned long flags; |
505 | struct irq_chip *chip = irq_desc_get_chip(desc); | 505 | struct irq_chip *chip = irq_desc_get_chip(desc); |
506 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); | 506 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); |
@@ -541,7 +541,7 @@ static void amd_gpio_irq_handler(unsigned int __irq, struct irq_desc *desc) | |||
541 | } | 541 | } |
542 | 542 | ||
543 | if (handled == 0) | 543 | if (handled == 0) |
544 | handle_bad_irq(irq, desc); | 544 | handle_bad_irq(desc); |
545 | 545 | ||
546 | spin_lock_irqsave(&gpio_dev->lock, flags); | 546 | spin_lock_irqsave(&gpio_dev->lock, flags); |
547 | reg = readl(gpio_dev->base + WAKE_INT_MASTER_REG); | 547 | reg = readl(gpio_dev->base + WAKE_INT_MASTER_REG); |
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c index bae0012ee356..b0fde0f385e6 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c | |||
@@ -1585,7 +1585,7 @@ static struct irq_chip gpio_irqchip = { | |||
1585 | .irq_set_wake = gpio_irq_set_wake, | 1585 | .irq_set_wake = gpio_irq_set_wake, |
1586 | }; | 1586 | }; |
1587 | 1587 | ||
1588 | static void gpio_irq_handler(unsigned irq, struct irq_desc *desc) | 1588 | static void gpio_irq_handler(struct irq_desc *desc) |
1589 | { | 1589 | { |
1590 | struct irq_chip *chip = irq_desc_get_chip(desc); | 1590 | struct irq_chip *chip = irq_desc_get_chip(desc); |
1591 | struct gpio_chip *gpio_chip = irq_desc_get_handler_data(desc); | 1591 | struct gpio_chip *gpio_chip = irq_desc_get_handler_data(desc); |
diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c index 3731cc67a88b..9c9b88934bcc 100644 --- a/drivers/pinctrl/pinctrl-coh901.c +++ b/drivers/pinctrl/pinctrl-coh901.c | |||
@@ -519,7 +519,7 @@ static struct irq_chip u300_gpio_irqchip = { | |||
519 | .irq_set_type = u300_gpio_irq_type, | 519 | .irq_set_type = u300_gpio_irq_type, |
520 | }; | 520 | }; |
521 | 521 | ||
522 | static void u300_gpio_irq_handler(unsigned __irq, struct irq_desc *desc) | 522 | static void u300_gpio_irq_handler(struct irq_desc *desc) |
523 | { | 523 | { |
524 | unsigned int irq = irq_desc_get_irq(desc); | 524 | unsigned int irq = irq_desc_get_irq(desc); |
525 | struct irq_chip *parent_chip = irq_desc_get_chip(desc); | 525 | struct irq_chip *parent_chip = irq_desc_get_chip(desc); |
diff --git a/drivers/pinctrl/pinctrl-pistachio.c b/drivers/pinctrl/pinctrl-pistachio.c index f22d585d9300..952b1c623887 100644 --- a/drivers/pinctrl/pinctrl-pistachio.c +++ b/drivers/pinctrl/pinctrl-pistachio.c | |||
@@ -1310,13 +1310,11 @@ static int pistachio_gpio_irq_set_type(struct irq_data *data, unsigned int type) | |||
1310 | return 0; | 1310 | return 0; |
1311 | } | 1311 | } |
1312 | 1312 | ||
1313 | static void pistachio_gpio_irq_handler(unsigned int __irq, | 1313 | static void pistachio_gpio_irq_handler(struct irq_desc *desc) |
1314 | struct irq_desc *desc) | ||
1315 | { | 1314 | { |
1316 | unsigned int irq = irq_desc_get_irq(desc); | ||
1317 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); | 1315 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); |
1318 | struct pistachio_gpio_bank *bank = gc_to_bank(gc); | 1316 | struct pistachio_gpio_bank *bank = gc_to_bank(gc); |
1319 | struct irq_chip *chip = irq_get_chip(irq); | 1317 | struct irq_chip *chip = irq_desc_get_chip(desc); |
1320 | unsigned long pending; | 1318 | unsigned long pending; |
1321 | unsigned int pin; | 1319 | unsigned int pin; |
1322 | 1320 | ||
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index c5246c05f70c..88bb707e107a 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c | |||
@@ -1475,7 +1475,7 @@ static const struct gpio_chip rockchip_gpiolib_chip = { | |||
1475 | * Interrupt handling | 1475 | * Interrupt handling |
1476 | */ | 1476 | */ |
1477 | 1477 | ||
1478 | static void rockchip_irq_demux(unsigned int __irq, struct irq_desc *desc) | 1478 | static void rockchip_irq_demux(struct irq_desc *desc) |
1479 | { | 1479 | { |
1480 | struct irq_chip *chip = irq_desc_get_chip(desc); | 1480 | struct irq_chip *chip = irq_desc_get_chip(desc); |
1481 | struct rockchip_pin_bank *bank = irq_desc_get_handler_data(desc); | 1481 | struct rockchip_pin_bank *bank = irq_desc_get_handler_data(desc); |
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index bf548c2a7a9d..ef04b962c3d5 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c | |||
@@ -1679,7 +1679,7 @@ static irqreturn_t pcs_irq_handler(int irq, void *d) | |||
1679 | * Use this if you have a separate interrupt for each | 1679 | * Use this if you have a separate interrupt for each |
1680 | * pinctrl-single instance. | 1680 | * pinctrl-single instance. |
1681 | */ | 1681 | */ |
1682 | static void pcs_irq_chain_handler(unsigned int irq, struct irq_desc *desc) | 1682 | static void pcs_irq_chain_handler(struct irq_desc *desc) |
1683 | { | 1683 | { |
1684 | struct pcs_soc_data *pcs_soc = irq_desc_get_handler_data(desc); | 1684 | struct pcs_soc_data *pcs_soc = irq_desc_get_handler_data(desc); |
1685 | struct irq_chip *chip; | 1685 | struct irq_chip *chip; |
diff --git a/drivers/pinctrl/pinctrl-st.c b/drivers/pinctrl/pinctrl-st.c index f8338d2e6b6b..389526e704fb 100644 --- a/drivers/pinctrl/pinctrl-st.c +++ b/drivers/pinctrl/pinctrl-st.c | |||
@@ -1460,7 +1460,7 @@ static void __gpio_irq_handler(struct st_gpio_bank *bank) | |||
1460 | } | 1460 | } |
1461 | } | 1461 | } |
1462 | 1462 | ||
1463 | static void st_gpio_irq_handler(unsigned irq, struct irq_desc *desc) | 1463 | static void st_gpio_irq_handler(struct irq_desc *desc) |
1464 | { | 1464 | { |
1465 | /* interrupt dedicated per bank */ | 1465 | /* interrupt dedicated per bank */ |
1466 | struct irq_chip *chip = irq_desc_get_chip(desc); | 1466 | struct irq_chip *chip = irq_desc_get_chip(desc); |
@@ -1472,7 +1472,7 @@ static void st_gpio_irq_handler(unsigned irq, struct irq_desc *desc) | |||
1472 | chained_irq_exit(chip, desc); | 1472 | chained_irq_exit(chip, desc); |
1473 | } | 1473 | } |
1474 | 1474 | ||
1475 | static void st_gpio_irqmux_handler(unsigned irq, struct irq_desc *desc) | 1475 | static void st_gpio_irqmux_handler(struct irq_desc *desc) |
1476 | { | 1476 | { |
1477 | struct irq_chip *chip = irq_desc_get_chip(desc); | 1477 | struct irq_chip *chip = irq_desc_get_chip(desc); |
1478 | struct st_pinctrl *info = irq_desc_get_handler_data(desc); | 1478 | struct st_pinctrl *info = irq_desc_get_handler_data(desc); |
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index 492cdd51dc5c..a0c7407c1cac 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c | |||
@@ -765,9 +765,8 @@ static struct irq_chip msm_gpio_irq_chip = { | |||
765 | .irq_set_wake = msm_gpio_irq_set_wake, | 765 | .irq_set_wake = msm_gpio_irq_set_wake, |
766 | }; | 766 | }; |
767 | 767 | ||
768 | static void msm_gpio_irq_handler(unsigned int __irq, struct irq_desc *desc) | 768 | static void msm_gpio_irq_handler(struct irq_desc *desc) |
769 | { | 769 | { |
770 | unsigned int irq = irq_desc_get_irq(desc); | ||
771 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); | 770 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); |
772 | const struct msm_pingroup *g; | 771 | const struct msm_pingroup *g; |
773 | struct msm_pinctrl *pctrl = to_msm_pinctrl(gc); | 772 | struct msm_pinctrl *pctrl = to_msm_pinctrl(gc); |
@@ -795,7 +794,7 @@ static void msm_gpio_irq_handler(unsigned int __irq, struct irq_desc *desc) | |||
795 | 794 | ||
796 | /* No interrupts were flagged */ | 795 | /* No interrupts were flagged */ |
797 | if (handled == 0) | 796 | if (handled == 0) |
798 | handle_bad_irq(irq, desc); | 797 | handle_bad_irq(desc); |
799 | 798 | ||
800 | chained_irq_exit(chip, desc); | 799 | chained_irq_exit(chip, desc); |
801 | } | 800 | } |
diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.c b/drivers/pinctrl/samsung/pinctrl-exynos.c index 5f45caaef46d..71ccf6a90b22 100644 --- a/drivers/pinctrl/samsung/pinctrl-exynos.c +++ b/drivers/pinctrl/samsung/pinctrl-exynos.c | |||
@@ -419,7 +419,7 @@ static const struct of_device_id exynos_wkup_irq_ids[] = { | |||
419 | }; | 419 | }; |
420 | 420 | ||
421 | /* interrupt handler for wakeup interrupts 0..15 */ | 421 | /* interrupt handler for wakeup interrupts 0..15 */ |
422 | static void exynos_irq_eint0_15(unsigned int irq, struct irq_desc *desc) | 422 | static void exynos_irq_eint0_15(struct irq_desc *desc) |
423 | { | 423 | { |
424 | struct exynos_weint_data *eintd = irq_desc_get_handler_data(desc); | 424 | struct exynos_weint_data *eintd = irq_desc_get_handler_data(desc); |
425 | struct samsung_pin_bank *bank = eintd->bank; | 425 | struct samsung_pin_bank *bank = eintd->bank; |
@@ -451,7 +451,7 @@ static inline void exynos_irq_demux_eint(unsigned long pend, | |||
451 | } | 451 | } |
452 | 452 | ||
453 | /* interrupt handler for wakeup interrupt 16 */ | 453 | /* interrupt handler for wakeup interrupt 16 */ |
454 | static void exynos_irq_demux_eint16_31(unsigned int irq, struct irq_desc *desc) | 454 | static void exynos_irq_demux_eint16_31(struct irq_desc *desc) |
455 | { | 455 | { |
456 | struct irq_chip *chip = irq_desc_get_chip(desc); | 456 | struct irq_chip *chip = irq_desc_get_chip(desc); |
457 | struct exynos_muxed_weint_data *eintd = irq_desc_get_handler_data(desc); | 457 | struct exynos_muxed_weint_data *eintd = irq_desc_get_handler_data(desc); |
diff --git a/drivers/pinctrl/samsung/pinctrl-s3c24xx.c b/drivers/pinctrl/samsung/pinctrl-s3c24xx.c index 019844d479bb..b3cd9ae3f4a2 100644 --- a/drivers/pinctrl/samsung/pinctrl-s3c24xx.c +++ b/drivers/pinctrl/samsung/pinctrl-s3c24xx.c | |||
@@ -240,7 +240,7 @@ static struct irq_chip s3c2410_eint0_3_chip = { | |||
240 | .irq_set_type = s3c24xx_eint_type, | 240 | .irq_set_type = s3c24xx_eint_type, |
241 | }; | 241 | }; |
242 | 242 | ||
243 | static void s3c2410_demux_eint0_3(unsigned int irq, struct irq_desc *desc) | 243 | static void s3c2410_demux_eint0_3(struct irq_desc *desc) |
244 | { | 244 | { |
245 | struct irq_data *data = irq_desc_get_irq_data(desc); | 245 | struct irq_data *data = irq_desc_get_irq_data(desc); |
246 | struct s3c24xx_eint_data *eint_data = irq_desc_get_handler_data(desc); | 246 | struct s3c24xx_eint_data *eint_data = irq_desc_get_handler_data(desc); |
@@ -295,7 +295,7 @@ static struct irq_chip s3c2412_eint0_3_chip = { | |||
295 | .irq_set_type = s3c24xx_eint_type, | 295 | .irq_set_type = s3c24xx_eint_type, |
296 | }; | 296 | }; |
297 | 297 | ||
298 | static void s3c2412_demux_eint0_3(unsigned int irq, struct irq_desc *desc) | 298 | static void s3c2412_demux_eint0_3(struct irq_desc *desc) |
299 | { | 299 | { |
300 | struct s3c24xx_eint_data *eint_data = irq_desc_get_handler_data(desc); | 300 | struct s3c24xx_eint_data *eint_data = irq_desc_get_handler_data(desc); |
301 | struct irq_data *data = irq_desc_get_irq_data(desc); | 301 | struct irq_data *data = irq_desc_get_irq_data(desc); |
@@ -388,12 +388,12 @@ static inline void s3c24xx_demux_eint(struct irq_desc *desc, | |||
388 | chained_irq_exit(chip, desc); | 388 | chained_irq_exit(chip, desc); |
389 | } | 389 | } |
390 | 390 | ||
391 | static void s3c24xx_demux_eint4_7(unsigned int irq, struct irq_desc *desc) | 391 | static void s3c24xx_demux_eint4_7(struct irq_desc *desc) |
392 | { | 392 | { |
393 | s3c24xx_demux_eint(desc, 0, 0xf0); | 393 | s3c24xx_demux_eint(desc, 0, 0xf0); |
394 | } | 394 | } |
395 | 395 | ||
396 | static void s3c24xx_demux_eint8_23(unsigned int irq, struct irq_desc *desc) | 396 | static void s3c24xx_demux_eint8_23(struct irq_desc *desc) |
397 | { | 397 | { |
398 | s3c24xx_demux_eint(desc, 8, 0xffff00); | 398 | s3c24xx_demux_eint(desc, 8, 0xffff00); |
399 | } | 399 | } |
diff --git a/drivers/pinctrl/samsung/pinctrl-s3c64xx.c b/drivers/pinctrl/samsung/pinctrl-s3c64xx.c index f5ea40a69711..43407ab248f5 100644 --- a/drivers/pinctrl/samsung/pinctrl-s3c64xx.c +++ b/drivers/pinctrl/samsung/pinctrl-s3c64xx.c | |||
@@ -407,7 +407,7 @@ static const struct irq_domain_ops s3c64xx_gpio_irqd_ops = { | |||
407 | .xlate = irq_domain_xlate_twocell, | 407 | .xlate = irq_domain_xlate_twocell, |
408 | }; | 408 | }; |
409 | 409 | ||
410 | static void s3c64xx_eint_gpio_irq(unsigned int irq, struct irq_desc *desc) | 410 | static void s3c64xx_eint_gpio_irq(struct irq_desc *desc) |
411 | { | 411 | { |
412 | struct irq_chip *chip = irq_desc_get_chip(desc); | 412 | struct irq_chip *chip = irq_desc_get_chip(desc); |
413 | struct s3c64xx_eint_gpio_data *data = irq_desc_get_handler_data(desc); | 413 | struct s3c64xx_eint_gpio_data *data = irq_desc_get_handler_data(desc); |
@@ -631,22 +631,22 @@ static inline void s3c64xx_irq_demux_eint(struct irq_desc *desc, u32 range) | |||
631 | chained_irq_exit(chip, desc); | 631 | chained_irq_exit(chip, desc); |
632 | } | 632 | } |
633 | 633 | ||
634 | static void s3c64xx_demux_eint0_3(unsigned int irq, struct irq_desc *desc) | 634 | static void s3c64xx_demux_eint0_3(struct irq_desc *desc) |
635 | { | 635 | { |
636 | s3c64xx_irq_demux_eint(desc, 0xf); | 636 | s3c64xx_irq_demux_eint(desc, 0xf); |
637 | } | 637 | } |
638 | 638 | ||
639 | static void s3c64xx_demux_eint4_11(unsigned int irq, struct irq_desc *desc) | 639 | static void s3c64xx_demux_eint4_11(struct irq_desc *desc) |
640 | { | 640 | { |
641 | s3c64xx_irq_demux_eint(desc, 0xff0); | 641 | s3c64xx_irq_demux_eint(desc, 0xff0); |
642 | } | 642 | } |
643 | 643 | ||
644 | static void s3c64xx_demux_eint12_19(unsigned int irq, struct irq_desc *desc) | 644 | static void s3c64xx_demux_eint12_19(struct irq_desc *desc) |
645 | { | 645 | { |
646 | s3c64xx_irq_demux_eint(desc, 0xff000); | 646 | s3c64xx_irq_demux_eint(desc, 0xff000); |
647 | } | 647 | } |
648 | 648 | ||
649 | static void s3c64xx_demux_eint20_27(unsigned int irq, struct irq_desc *desc) | 649 | static void s3c64xx_demux_eint20_27(struct irq_desc *desc) |
650 | { | 650 | { |
651 | s3c64xx_irq_demux_eint(desc, 0xff00000); | 651 | s3c64xx_irq_demux_eint(desc, 0xff00000); |
652 | } | 652 | } |
diff --git a/drivers/pinctrl/sirf/pinctrl-atlas7.c b/drivers/pinctrl/sirf/pinctrl-atlas7.c index 9df0c5f25824..0d24d9e4b70c 100644 --- a/drivers/pinctrl/sirf/pinctrl-atlas7.c +++ b/drivers/pinctrl/sirf/pinctrl-atlas7.c | |||
@@ -4489,7 +4489,7 @@ static struct irq_chip atlas7_gpio_irq_chip = { | |||
4489 | .irq_set_type = atlas7_gpio_irq_type, | 4489 | .irq_set_type = atlas7_gpio_irq_type, |
4490 | }; | 4490 | }; |
4491 | 4491 | ||
4492 | static void atlas7_gpio_handle_irq(unsigned int __irq, struct irq_desc *desc) | 4492 | static void atlas7_gpio_handle_irq(struct irq_desc *desc) |
4493 | { | 4493 | { |
4494 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); | 4494 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); |
4495 | struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(gc); | 4495 | struct atlas7_gpio_chip *a7gc = to_atlas7_gpio(gc); |
@@ -4512,7 +4512,7 @@ static void atlas7_gpio_handle_irq(unsigned int __irq, struct irq_desc *desc) | |||
4512 | if (!status) { | 4512 | if (!status) { |
4513 | pr_warn("%s: gpio [%s] status %#x no interrupt is flaged\n", | 4513 | pr_warn("%s: gpio [%s] status %#x no interrupt is flaged\n", |
4514 | __func__, gc->label, status); | 4514 | __func__, gc->label, status); |
4515 | handle_bad_irq(irq, desc); | 4515 | handle_bad_irq(desc); |
4516 | return; | 4516 | return; |
4517 | } | 4517 | } |
4518 | 4518 | ||
diff --git a/drivers/pinctrl/sirf/pinctrl-sirf.c b/drivers/pinctrl/sirf/pinctrl-sirf.c index f8bd9fb52033..2a8d69725de8 100644 --- a/drivers/pinctrl/sirf/pinctrl-sirf.c +++ b/drivers/pinctrl/sirf/pinctrl-sirf.c | |||
@@ -545,7 +545,7 @@ static struct irq_chip sirfsoc_irq_chip = { | |||
545 | .irq_set_type = sirfsoc_gpio_irq_type, | 545 | .irq_set_type = sirfsoc_gpio_irq_type, |
546 | }; | 546 | }; |
547 | 547 | ||
548 | static void sirfsoc_gpio_handle_irq(unsigned int __irq, struct irq_desc *desc) | 548 | static void sirfsoc_gpio_handle_irq(struct irq_desc *desc) |
549 | { | 549 | { |
550 | unsigned int irq = irq_desc_get_irq(desc); | 550 | unsigned int irq = irq_desc_get_irq(desc); |
551 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); | 551 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); |
@@ -570,7 +570,7 @@ static void sirfsoc_gpio_handle_irq(unsigned int __irq, struct irq_desc *desc) | |||
570 | printk(KERN_WARNING | 570 | printk(KERN_WARNING |
571 | "%s: gpio id %d status %#x no interrupt is flagged\n", | 571 | "%s: gpio id %d status %#x no interrupt is flagged\n", |
572 | __func__, bank->id, status); | 572 | __func__, bank->id, status); |
573 | handle_bad_irq(irq, desc); | 573 | handle_bad_irq(desc); |
574 | return; | 574 | return; |
575 | } | 575 | } |
576 | 576 | ||
diff --git a/drivers/pinctrl/spear/pinctrl-plgpio.c b/drivers/pinctrl/spear/pinctrl-plgpio.c index ae8f29fb5536..1f0af250dbb5 100644 --- a/drivers/pinctrl/spear/pinctrl-plgpio.c +++ b/drivers/pinctrl/spear/pinctrl-plgpio.c | |||
@@ -356,7 +356,7 @@ static struct irq_chip plgpio_irqchip = { | |||
356 | .irq_set_type = plgpio_irq_set_type, | 356 | .irq_set_type = plgpio_irq_set_type, |
357 | }; | 357 | }; |
358 | 358 | ||
359 | static void plgpio_irq_handler(unsigned irq, struct irq_desc *desc) | 359 | static void plgpio_irq_handler(struct irq_desc *desc) |
360 | { | 360 | { |
361 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); | 361 | struct gpio_chip *gc = irq_desc_get_handler_data(desc); |
362 | struct plgpio *plgpio = container_of(gc, struct plgpio, chip); | 362 | struct plgpio *plgpio = container_of(gc, struct plgpio, chip); |
diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c index 31af97d89272..38e0c7bdd2ac 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c | |||
@@ -740,7 +740,7 @@ static struct irq_domain_ops sunxi_pinctrl_irq_domain_ops = { | |||
740 | .xlate = sunxi_pinctrl_irq_of_xlate, | 740 | .xlate = sunxi_pinctrl_irq_of_xlate, |
741 | }; | 741 | }; |
742 | 742 | ||
743 | static void sunxi_pinctrl_irq_handler(unsigned __irq, struct irq_desc *desc) | 743 | static void sunxi_pinctrl_irq_handler(struct irq_desc *desc) |
744 | { | 744 | { |
745 | unsigned int irq = irq_desc_get_irq(desc); | 745 | unsigned int irq = irq_desc_get_irq(desc); |
746 | struct irq_chip *chip = irq_desc_get_chip(desc); | 746 | struct irq_chip *chip = irq_desc_get_chip(desc); |
diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c index 043419dcee92..8e72bcbd3d6d 100644 --- a/drivers/sh/intc/core.c +++ b/drivers/sh/intc/core.c | |||
@@ -65,7 +65,7 @@ void intc_set_prio_level(unsigned int irq, unsigned int level) | |||
65 | raw_spin_unlock_irqrestore(&intc_big_lock, flags); | 65 | raw_spin_unlock_irqrestore(&intc_big_lock, flags); |
66 | } | 66 | } |
67 | 67 | ||
68 | static void intc_redirect_irq(unsigned int irq, struct irq_desc *desc) | 68 | static void intc_redirect_irq(struct irq_desc *desc) |
69 | { | 69 | { |
70 | generic_handle_irq((unsigned int)irq_desc_get_handler_data(desc)); | 70 | generic_handle_irq((unsigned int)irq_desc_get_handler_data(desc)); |
71 | } | 71 | } |
diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c index bafc51c6f0ba..e7899624aa0b 100644 --- a/drivers/sh/intc/virq.c +++ b/drivers/sh/intc/virq.c | |||
@@ -109,7 +109,7 @@ static int add_virq_to_pirq(unsigned int irq, unsigned int virq) | |||
109 | return 0; | 109 | return 0; |
110 | } | 110 | } |
111 | 111 | ||
112 | static void intc_virq_handler(unsigned int __irq, struct irq_desc *desc) | 112 | static void intc_virq_handler(struct irq_desc *desc) |
113 | { | 113 | { |
114 | unsigned int irq = irq_desc_get_irq(desc); | 114 | unsigned int irq = irq_desc_get_irq(desc); |
115 | struct irq_data *data = irq_desc_get_irq_data(desc); | 115 | struct irq_data *data = irq_desc_get_irq_data(desc); |
@@ -127,7 +127,7 @@ static void intc_virq_handler(unsigned int __irq, struct irq_desc *desc) | |||
127 | handle = (unsigned long)irq_desc_get_handler_data(vdesc); | 127 | handle = (unsigned long)irq_desc_get_handler_data(vdesc); |
128 | addr = INTC_REG(d, _INTC_ADDR_E(handle), 0); | 128 | addr = INTC_REG(d, _INTC_ADDR_E(handle), 0); |
129 | if (intc_reg_fns[_INTC_FN(handle)](addr, handle, 0)) | 129 | if (intc_reg_fns[_INTC_FN(handle)](addr, handle, 0)) |
130 | generic_handle_irq_desc(entry->irq, vdesc); | 130 | generic_handle_irq_desc(vdesc); |
131 | } | 131 | } |
132 | } | 132 | } |
133 | 133 | ||
diff --git a/drivers/soc/dove/pmu.c b/drivers/soc/dove/pmu.c index 6bc13f99489a..052aecf29893 100644 --- a/drivers/soc/dove/pmu.c +++ b/drivers/soc/dove/pmu.c | |||
@@ -222,7 +222,7 @@ static void __pmu_domain_register(struct pmu_domain *domain, | |||
222 | } | 222 | } |
223 | 223 | ||
224 | /* PMU IRQ controller */ | 224 | /* PMU IRQ controller */ |
225 | static void pmu_irq_handler(unsigned int irq, struct irq_desc *desc) | 225 | static void pmu_irq_handler(struct irq_desc *desc) |
226 | { | 226 | { |
227 | struct pmu_data *pmu = irq_desc_get_handler_data(desc); | 227 | struct pmu_data *pmu = irq_desc_get_handler_data(desc); |
228 | struct irq_chip_generic *gc = pmu->irq_gc; | 228 | struct irq_chip_generic *gc = pmu->irq_gc; |
@@ -232,7 +232,7 @@ static void pmu_irq_handler(unsigned int irq, struct irq_desc *desc) | |||
232 | u32 done = ~0; | 232 | u32 done = ~0; |
233 | 233 | ||
234 | if (stat == 0) { | 234 | if (stat == 0) { |
235 | handle_bad_irq(irq_desc_get_irq(desc), desc); | 235 | handle_bad_irq(desc); |
236 | return; | 236 | return; |
237 | } | 237 | } |
238 | 238 | ||
diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c index bdfb3c84c3cb..4a3cf9ba152f 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c | |||
@@ -451,7 +451,7 @@ static void periph_interrupt(struct spmi_pmic_arb_dev *pa, u8 apid) | |||
451 | } | 451 | } |
452 | } | 452 | } |
453 | 453 | ||
454 | static void pmic_arb_chained_irq(unsigned int irq, struct irq_desc *desc) | 454 | static void pmic_arb_chained_irq(struct irq_desc *desc) |
455 | { | 455 | { |
456 | struct spmi_pmic_arb_dev *pa = irq_desc_get_handler_data(desc); | 456 | struct spmi_pmic_arb_dev *pa = irq_desc_get_handler_data(desc); |
457 | struct irq_chip *chip = irq_desc_get_chip(desc); | 457 | struct irq_chip *chip = irq_desc_get_chip(desc); |