Optimize irq flow handler
Subsystems (72)
cover Optimize irq flow handler
This is an patch set to optimize irq flow handler. It could be split into three part.
1) Patch 1-12 get rid of redundant looking up of irq_desc and irq_data when we already had an pointer to corresponding irq_desc in irq flow handler. This part should be pretty safe.
2) Patch 13 is a perparation patch.
3) Patch 14-25 should be merge into one big fat patch, which kills the first parameter 'irq' of irq_flow_handler_t. I hope I have made all needed changes, but there are still some handler missed. After the conversion, there are only about 20 irq handlers which really access the irq number. This part is still in early stage and may cause building failures.
Please comment on whether we should be go on with the third part to kill 'irq' of irq_flow_handler_t.
Thanks!
Gerry
Jiang Liu (25):
ARM, irq: Use irq_desc_get_xxx() to avoid redundant lookup of
irq_desc
avr32, irq: Use irq_desc_get_xxx() to avoid redundant lookup of
irq_desc
MIPS, irq: Use irq_desc_get_xxx() to avoid redundant lookup of
irq_desc
powerpc, irq: Use irq_desc_get_xxx() to avoid redundant lookup of
irq_desc
gpio: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
pinctrl: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
irqchip: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
mfd: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
ipu: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
sh: intc: Use irq_desc_get_xxx() to avoid redundant lookup of
irq_desc
keystone, irq: Use irq_data_get_xxx() to avoid redundant lookup of
irq_data
spmi: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
genirq: Kill the parameter 'irq' of kstat_incr_irqs_this_cpu()
genirq: Kill the first parameter 'irq' of irq_flow_handler_t
genirq: Kill the first parameter 'irq' of irq_flow_handler_t
genirq: Kill the first parameter 'irq' of irq_flow_handler_t
genirq: Kill the first parameter 'irq' of irq_flow_handler_t
genirq: Kill the first parameter 'irq' of irq_flow_handler_t
genirq: Kill the first parameter 'irq' of irq_flow_handler_t
genirq: Kill the first parameter 'irq' of irq_flow_handler_t
genirq: Kill the first parameter 'irq' of irq_flow_handler_t
genirq: Kill the first parameter 'irq' of irq_flow_handler_t
genirq: Kill the first parameter 'irq' of irq_flow_handler_t
genirq: Kill the first parameter 'irq' of irq_flow_handler_t
genirq: Kill the first parameter 'irq' of irq_flow_handler_t
arch/alpha/kernel/irq.c | 2 +- arch/arm/common/it8152.c | 2 +- arch/arm/common/locomo.c | 5 +-- arch/arm/common/sa1111.c | 6 ++-- arch/arm/include/asm/hardware/it8152.h | 2 +- arch/arm/include/asm/mach/irq.h | 4 +-- arch/arm/mach-dove/irq.c | 5 +-- arch/arm/mach-footbridge/isa-irq.c | 4 +-- arch/arm/mach-gemini/gpio.c | 2 +- arch/arm/mach-imx/3ds_debugboard.c | 2 +- arch/arm/mach-imx/mach-mx31ads.c | 2 +- arch/arm/mach-iop13xx/msi.c | 2 +- arch/arm/mach-lpc32xx/irq.c | 4 +-- arch/arm/mach-omap1/fpga.c | 2 +- arch/arm/mach-omap2/prm_common.c | 2 +- arch/arm/mach-pxa/balloon3.c | 3 +- arch/arm/mach-pxa/cm-x2xx-pci.c | 4 +-- arch/arm/mach-pxa/lpd270.c | 3 +- arch/arm/mach-pxa/pcm990-baseboard.c | 1 + arch/arm/mach-pxa/viper.c | 3 +- arch/arm/mach-pxa/zeus.c | 3 +- arch/arm/mach-rpc/ecard.c | 2 +- arch/arm/mach-s3c64xx/common.c | 8 ++--- arch/arm/mach-sa1100/neponset.c | 2 +- arch/arm/plat-orion/gpio.c | 4 +-- arch/avr32/mach-at32ap/extint.c | 2 +- arch/avr32/mach-at32ap/pio.c | 4 +-- arch/blackfin/kernel/ipipe.c | 4 +-- arch/c6x/platforms/megamod-pic.c | 3 +- arch/m68k/amiga/amiints.c | 8 ++--- arch/m68k/coldfire/intc-5272.c | 4 +-- arch/m68k/include/asm/mac_via.h | 2 +- arch/m68k/mac/baboon.c | 2 +- arch/m68k/mac/oss.c | 4 +-- arch/m68k/mac/psc.c | 3 +- arch/m68k/mac/via.c | 6 ++-- arch/mips/alchemy/common/irq.c | 4 +-- arch/mips/alchemy/devboards/bcsr.c | 3 +- arch/mips/ath25/ar2315.c | 4 +-- arch/mips/ath25/ar5312.c | 4 +-- arch/mips/ath79/irq.c | 11 ++++--- arch/mips/cavium-octeon/octeon-irq.c | 12 ++++--- arch/mips/include/asm/netlogic/common.h | 4 +-- arch/mips/jz4740/gpio.c | 2 +- arch/mips/netlogic/common/smp.c | 4 +-- arch/mips/pci/pci-ar2315.c | 4 +-- arch/mips/pci/pci-ar71xx.c | 4 +-- arch/mips/pci/pci-ar724x.c | 4 +-- arch/mips/pci/pci-rt3883.c | 5 +-- arch/mips/ralink/irq.c | 4 +-- arch/powerpc/include/asm/qe_ic.h | 23 ++++++-------- arch/powerpc/include/asm/tsi108_pci.h | 2 +- arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 4 ++- arch/powerpc/platforms/52xx/media5200.c | 2 +- arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 4 +-- arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 2 +- arch/powerpc/platforms/85xx/common.c | 2 +- arch/powerpc/platforms/85xx/mpc85xx_ds.c | 2 +- arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 3 +- arch/powerpc/platforms/86xx/pic.c | 2 +- arch/powerpc/platforms/8xx/m8xx_setup.c | 2 +- arch/powerpc/platforms/cell/axon_msi.c | 4 +-- arch/powerpc/platforms/cell/interrupt.c | 3 +- arch/powerpc/platforms/cell/spider-pic.c | 2 +- arch/powerpc/platforms/chrp/setup.c | 2 +- arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 2 +- arch/powerpc/platforms/embedded6xx/mvme5100.c | 2 +- arch/powerpc/platforms/pseries/setup.c | 2 +- arch/powerpc/sysdev/ge/ge_pic.c | 2 +- arch/powerpc/sysdev/mpic.c | 2 +- arch/powerpc/sysdev/qe_lib/qe_ic.c | 4 +-- arch/powerpc/sysdev/tsi108_pci.c | 2 +- arch/powerpc/sysdev/uic.c | 4 +-- arch/powerpc/sysdev/xics/xics-common.c | 2 +- arch/powerpc/sysdev/xilinx_intc.c | 2 +- arch/sh/boards/mach-se/7343/irq.c | 4 +-- arch/sh/boards/mach-se/7722/irq.c | 3 +- arch/sh/boards/mach-se/7724/irq.c | 3 +- arch/sh/boards/mach-x3proto/gpio.c | 4 +-- arch/sh/cchips/hd6446x/hd64461.c | 2 +- arch/sparc/kernel/leon_kernel.c | 2 +- arch/sparc/kernel/leon_pci_grpci1.c | 2 +- arch/sparc/kernel/leon_pci_grpci2.c | 2 +- arch/tile/kernel/pci_gx.c | 4 +-- arch/unicore32/kernel/irq.c | 3 +- arch/x86/kernel/irq_64.c | 2 +- arch/x86/lguest/boot.c | 2 +- drivers/dma/ipu/ipu_irq.c | 8 +++-- drivers/gpio/gpio-altera.c | 6 ++-- drivers/gpio/gpio-bcm-kona.c | 4 +-- drivers/gpio/gpio-davinci.c | 3 +- drivers/gpio/gpio-dwapb.c | 4 +-- drivers/gpio/gpio-ep93xx.c | 5 +-- drivers/gpio/gpio-intel-mid.c | 2 +- drivers/gpio/gpio-lynxpoint.c | 2 +- drivers/gpio/gpio-mpc8xxx.c | 2 +- drivers/gpio/gpio-msic.c | 2 +- drivers/gpio/gpio-msm-v2.c | 2 +- drivers/gpio/gpio-mvebu.c | 4 +-- drivers/gpio/gpio-mxc.c | 10 +++--- drivers/gpio/gpio-mxs.c | 4 +-- drivers/gpio/gpio-omap.c | 4 +-- drivers/gpio/gpio-pl061.c | 2 +- drivers/gpio/gpio-pxa.c | 2 +- drivers/gpio/gpio-sa1100.c | 4 +-- drivers/gpio/gpio-tegra.c | 6 ++-- drivers/gpio/gpio-timberdale.c | 7 +++-- drivers/gpio/gpio-tz1090.c | 4 +-- drivers/gpio/gpio-vf610.c | 4 +-- drivers/gpio/gpio-zynq.c | 4 +-- drivers/gpu/ipu-v3/ipu-common.c | 8 ++--- drivers/irqchip/exynos-combiner.c | 8 ++--- drivers/irqchip/irq-armada-370-xp.c | 2 +- drivers/irqchip/irq-bcm7038-l1.c | 2 +- drivers/irqchip/irq-bcm7120-l2.c | 2 +- drivers/irqchip/irq-brcmstb-l2.c | 6 ++-- drivers/irqchip/irq-dw-apb-ictl.c | 6 ++-- drivers/irqchip/irq-gic.c | 6 ++-- drivers/irqchip/irq-imgpdc.c | 5 +-- drivers/irqchip/irq-keystone.c | 3 +- drivers/irqchip/irq-metag-ext.c | 3 +- drivers/irqchip/irq-metag.c | 3 +- drivers/irqchip/irq-mips-gic.c | 2 +- drivers/irqchip/irq-mmp.c | 3 +- drivers/irqchip/irq-orion.c | 4 +-- drivers/irqchip/irq-s3c24xx.c | 3 +- drivers/irqchip/irq-sunxi-nmi.c | 4 +-- drivers/irqchip/irq-tb10x.c | 4 +-- drivers/irqchip/irq-versatile-fpga.c | 6 ++-- drivers/irqchip/irq-vic.c | 2 +- drivers/irqchip/spear-shirq.c | 4 +-- drivers/mfd/asic3.c | 2 +- drivers/mfd/ezx-pcap.c | 4 +-- drivers/mfd/htc-egpio.c | 2 +- drivers/mfd/jz4740-adc.c | 2 +- drivers/mfd/max8997-irq.c | 8 ++--- drivers/mfd/mt6397-core.c | 8 ++--- drivers/mfd/pm8921-core.c | 2 +- drivers/mfd/t7l66xb.c | 4 +-- drivers/mfd/tc6393xb.c | 4 +-- drivers/mfd/twl6030-irq.c | 2 +- drivers/mfd/ucb1x00-core.c | 4 +-- drivers/pci/host/pci-keystone-dw.c | 15 ++++----- drivers/pci/host/pci-keystone.c | 7 +++-- drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c | 2 +- drivers/pinctrl/intel/pinctrl-baytrail.c | 2 +- drivers/pinctrl/intel/pinctrl-cherryview.c | 4 +-- drivers/pinctrl/intel/pinctrl-intel.c | 4 +-- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 6 ++-- drivers/pinctrl/nomadik/pinctrl-nomadik.c | 14 ++++----- drivers/pinctrl/pinctrl-amd.c | 7 +++-- drivers/pinctrl/pinctrl-at91.c | 4 +-- drivers/pinctrl/pinctrl-coh901.c | 7 +++-- drivers/pinctrl/pinctrl-rockchip.c | 7 +++-- drivers/pinctrl/pinctrl-single.c | 4 +-- drivers/pinctrl/pinctrl-st.c | 10 +++--- drivers/pinctrl/qcom/pinctrl-msm.c | 6 ++-- drivers/pinctrl/samsung/pinctrl-exynos.c | 12 +++---- drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 26 ++++++++-------- drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 32 +++++++++---------- drivers/pinctrl/sirf/pinctrl-sirf.c | 7 +++-- drivers/pinctrl/spear/pinctrl-plgpio.c | 2 +- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 7 +++-- drivers/sh/intc/core.c | 4 +-- drivers/sh/intc/virq.c | 17 +++++----- drivers/spmi/spmi-pmic-arb.c | 6 ++-- include/linux/irq.h | 16 +++++----- include/linux/irqdesc.h | 9 ++++-- include/linux/irqhandler.h | 2 +- kernel/irq/chip.c | 38 ++++++++++------------- kernel/irq/handle.c | 6 ++-- kernel/irq/internals.h | 2 +- kernel/irq/irqdesc.c | 4 +-- 173 files changed, 420 insertions(+), 398 deletions(-)
Signature · 1 line
1.7.10.4
RFC 1/25 ARM, irq: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we already have a pointer to corresponding irq_desc.
Signed-off-by Jiang Liu <[email protected]>
--- arch/arm/common/locomo.c | 2 +- arch/arm/common/sa1111.c | 2 +- arch/arm/plat-orion/gpio.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/common/locomo.c +1 -1
@@ -140,7 +140,7 @@ static struct locomo_dev_info locomo_devices[] = {static void locomo_handler (unsigned int irq,struct irq_desc *desc) { -struct locomo *lchip =irq_get_chip_data (irq); +struct locomo *lchip =irq_desc_get_chip_data (desc);int req, i;/* Acknowledge the parent IRQ */
arch/arm/common/sa1111.c +1 -1
@@ -200,7 +200,7 @@ static void sa1111_irq_handler(unsigned int irq, struct irq_desc *desc) { unsigned int stat0, stat1, i; -struct sa1111 *sachip =irq_get_handler_data (irq); +struct sa1111 *sachip =irq_desc_get_handler_data (desc);void __iomem *mapbase = sachip->base +SA1111_INTC ; stat0 =sa1111_readl (mapbase +SA1111_INTSTATCLR0 );
arch/arm/plat-orion/gpio.c +1 -1
@@ -409,7 +409,7 @@ static int gpio_irq_set_type(struct irq_data *d, u32 type)static void gpio_irq_handler (unsigned irq,struct irq_desc *desc) { -struct orion_gpio_chip *ochip =irq_get_handler_data (irq); +struct orion_gpio_chip *ochip =irq_desc_get_handler_data (desc);u32 cause, type;int i;
Signature · 1 line
1.7.10.4
Re: [RFC v1 01/25] ARM, irq: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
arch/arm/common/sa1111.c static void · line 206
Quoted 13 lines · Jiang Liu
arch/arm/common/sa1111.c +1
-1@@ -200,7 +200,7 @@ static void sa1111_irq_handler(unsigned int irq, struct irq_desc *desc) { unsigned int stat0, stat1, i; -struct sa1111 *sachip =irq_get_handler_data (irq); +struct sa1111 *sachip =irq_desc_get_handler_data (desc);void __iomem *mapbase = sachip->base +SA1111_INTC ; stat0 =sa1111_readl (mapbase +SA1111_INTSTATCLR0 );
For this one only,
Acked-by Russell King <[email protected]>
Other maintainers are responsible for the others...
Thanks.
Signature · 2 lines
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up according to speedtest.net.
RFC 2/25 avr32, irq: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
In reply to Jiang LiuUse irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we already have a pointer to corresponding irq_desc.
Signed-off-by Jiang Liu <[email protected]>
--- arch/avr32/mach-at32ap/pio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/avr32/mach-at32ap/pio.c +1 -1
@@ -286,7 +286,7 @@ static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)struct pio_device *pio =irq_desc_get_chip_data (desc);unsigned gpio_irq; - gpio_irq = (unsigned )irq_get_handler_data (irq); + gpio_irq = (unsigned )irq_desc_get_handler_data (desc);for (;;) {u32 isr;
Signature · 1 line
1.7.10.4
Re: [RFC v1 02/25] avr32, irq: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
Quoted 4 lines · Jiang Liu
Use
irq_desc_get_xxx()to avoid redundant lookup ofirq_descwhile we already have a pointer to correspondingirq_desc.Signed-off-by Jiang Liu <[email protected]>
Quoted 17 lines
--- arch/avr32/mach-at32ap/pio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/avr32/mach-at32ap/pio.c +1
-1@@ -286,7 +286,7 @@ static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)struct pio_device *pio =irq_desc_get_chip_data (desc);unsigned gpio_irq; - gpio_irq = (unsigned )irq_get_handler_data (irq); + gpio_irq = (unsigned )irq_desc_get_handler_data (desc);for (;;) {u32 isr;
Signature · 2 lines
mvh Hans-Christian Egtvedt
RFC 3/25 MIPS, irq: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
In reply to Jiang LiuUse irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we already have a pointer to corresponding irq_desc.
Signed-off-by Jiang Liu <[email protected]>
--- arch/mips/ath25/ar2315.c | 2 +- arch/mips/ath25/ar5312.c | 2 +- arch/mips/cavium-octeon/octeon-irq.c | 4 +++- arch/mips/pci/pci-ar2315.c | 2 +- arch/mips/pci/pci-ar71xx.c | 2 +- arch/mips/pci/pci-ar724x.c | 2 +- arch/mips/pci/pci-rt3883.c | 2 +- arch/mips/ralink/irq.c | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-)
arch/mips/ath25/ar2315.c +1 -1
@@ -76,7 +76,7 @@ static void ar2315_misc_irq_handler(unsigned irq, struct irq_desc *desc)unsigned nr, misc_irq =0 ;if (pending) { -struct irq_domain *domain =irq_get_handler_data (irq); +struct irq_domain *domain =irq_desc_get_handler_data (desc); nr =__ffs (pending); misc_irq =irq_find_mapping (domain, nr);
arch/mips/ath25/ar5312.c +1 -1
@@ -80,7 +80,7 @@ static void ar5312_misc_irq_handler(unsigned irq, struct irq_desc *desc)unsigned nr, misc_irq =0 ;if (pending) { -struct irq_domain *domain =irq_get_handler_data (irq); +struct irq_domain *domain =irq_desc_get_handler_data (desc); nr =__ffs (pending); misc_irq =irq_find_mapping (domain, nr);
arch/mips/cavium-octeon/octeon-irq.c +3 -1
@@ -699,7 +699,9 @@ static void octeon_irq_ciu_gpio_ack(struct irq_data *data)static void octeon_irq_handle_trigger (unsigned int irq,struct irq_desc *desc) { -if (irq_get_trigger_type (irq) &IRQ_TYPE_EDGE_BOTH ) +struct irq_data *data =irq_desc_get_irq_data (desc); + +if (irqd_get_trigger_type (data) &IRQ_TYPE_EDGE_BOTH )handle_edge_irq (irq, desc);else handle_level_irq (irq, desc);
arch/mips/pci/pci-ar2315.c +1 -1
@@ -320,7 +320,7 @@ static int ar2315_pci_host_setup(struct ar2315_pci_ctrl *apc)static void ar2315_pci_irq_handler (unsigned irq,struct irq_desc *desc) { -struct ar2315_pci_ctrl *apc =irq_get_handler_data (irq); +struct ar2315_pci_ctrl *apc =irq_desc_get_handler_data (desc);u32 pending =ar2315_pci_reg_read (apc,AR2315_PCI_ISR ) &ar2315_pci_reg_read (apc,AR2315_PCI_IMR );unsigned pci_irq =0 ;
arch/mips/pci/pci-ar71xx.c +1 -1
@@ -232,7 +232,7 @@ static void ar71xx_pci_irq_handler(unsigned int irq, struct irq_desc *desc)void __iomem *base = ath79_reset_base;u32 pending; - apc =irq_get_handler_data (irq); + apc =irq_desc_get_handler_data (desc); pending =__raw_readl (base +AR71XX_RESET_REG_PCI_INT_STATUS ) &__raw_readl (base +AR71XX_RESET_REG_PCI_INT_ENABLE );
arch/mips/pci/pci-ar724x.c +1 -1
@@ -231,7 +231,7 @@ static void ar724x_pci_irq_handler(unsigned int irq, struct irq_desc *desc)void __iomem *base;u32 pending; - apc =irq_get_handler_data (irq); + apc =irq_desc_get_handler_data (desc); base = apc->ctrl_base; pending = __raw_readl(base + AR724X_PCI_REG_INT_STATUS) &
arch/mips/pci/pci-rt3883.c +1 -1
@@ -134,7 +134,7 @@ static void rt3883_pci_irq_handler(unsigned int irq, struct irq_desc *desc)struct rt3883_pci_controller *rpc;u32 pending; - rpc =irq_get_handler_data (irq); + rpc =irq_desc_get_handler_data (desc); pending =rt3883_pci_r32 (rpc,RT3883_PCI_REG_PCIINT ) &rt3883_pci_r32 (rpc,RT3883_PCI_REG_PCIENA );
arch/mips/ralink/irq.c +1 -1
@@ -100,7 +100,7 @@ static void ralink_intc_irq_handler(unsigned int irq, struct irq_desc *desc)u32 pending =rt_intc_r32 (INTC_REG_STATUS0 );if (pending) { -struct irq_domain *domain =irq_get_handler_data (irq); +struct irq_domain *domain =irq_desc_get_handler_data (desc);generic_handle_irq (irq_find_mapping (domain,__ffs (pending))); }else {spurious_interrupt ();
Signature · 1 line
1.7.10.4
RFC 4/25 powerpc, irq: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
In reply to Jiang LiuUse irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we already have a pointer to corresponding irq_desc.
Signed-off-by Jiang Liu <[email protected]>
--- arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +- arch/powerpc/platforms/cell/axon_msi.c | 2 +- arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 2 +- arch/powerpc/sysdev/uic.c | 2 +- arch/powerpc/sysdev/xics/xics-common.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
arch/powerpc/platforms/52xx/mpc52xx_gpt.c +1 -1
@@ -193,7 +193,7 @@ static struct irq_chip mpc52xx_gpt_irq_chip = {void mpc52xx_gpt_irq_cascade (unsigned int virq,struct irq_desc *desc) { -struct mpc52xx_gpt_priv *gpt =irq_get_handler_data (virq); +struct mpc52xx_gpt_priv *gpt =irq_desc_get_handler_data (desc);int sub_virq;u32 status;
arch/powerpc/platforms/cell/axon_msi.c +1 -1
@@ -95,7 +95,7 @@ static void msic_dcr_write(struct axon_msic *msic, unsigned int dcr_n, u32 val)static void axon_msi_cascade (unsigned int irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc); -struct axon_msic *msic =irq_get_handler_data (irq); +struct axon_msic *msic =irq_desc_get_handler_data (desc);u32 write_offset, msi;int idx;int retry =0 ;
arch/powerpc/platforms/embedded6xx/hlwd-pic.c +1 -1
@@ -124,7 +124,7 @@ static void hlwd_pic_irq_cascade(unsigned int cascade_virq, struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc); -struct irq_domain *irq_domain =irq_get_handler_data (cascade_virq); +struct irq_domain *irq_domain =irq_desc_get_handler_data (desc);unsigned int virq;raw_spin_lock (&desc->lock);
arch/powerpc/sysdev/uic.c +1 -1
@@ -198,7 +198,7 @@ void uic_irq_cascade(unsigned int virq, struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct irq_data *idata =irq_desc_get_irq_data (desc); -struct uic *uic =irq_get_handler_data (virq); +struct uic *uic =irq_desc_get_handler_data (desc);u32 msr;int src;int subvirq;
arch/powerpc/sysdev/xics/xics-common.c +1 -1
@@ -227,7 +227,7 @@ void xics_migrate_irqs_away(void)/* Locate interrupt server */ server =-1 ; - ics =irq_get_chip_data (virq); + ics =irq_desc_get_chip_data (desc);if (ics) server = ics->get_server (ics, irq);if (server <0 ) {
Signature · 1 line
1.7.10.4
Michael Ellerman
reviewerRe: [RFC, v1, 04/25] powerpc, irq: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
Quoted 11 lines · Jiang Liu
Use
irq_desc_get_xxx()to avoid redundant lookup ofirq_descwhile we already have a pointer to correspondingirq_desc.Signed-off-by Jiang Liu <[email protected]>--- arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +- arch/powerpc/platforms/cell/axon_msi.c | 2 +- arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 2 +- arch/powerpc/sysdev/uic.c | 2 +- arch/powerpc/sysdev/xics/xics-common.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
Applied thanks.
cheers
RFC 5/25 gpio: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
In reply to Jiang LiuUse irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we already have a pointer to corresponding irq_desc.
Signed-off-by Jiang Liu <[email protected]>
--- drivers/gpio/gpio-bcm-kona.c | 2 +- drivers/gpio/gpio-dwapb.c | 2 +- drivers/gpio/gpio-mvebu.c | 2 +- drivers/gpio/gpio-mxc.c | 6 +++--- drivers/gpio/gpio-mxs.c | 2 +- drivers/gpio/gpio-omap.c | 2 +- drivers/gpio/gpio-tegra.c | 4 +--- drivers/gpio/gpio-timberdale.c | 2 +- drivers/gpio/gpio-vf610.c | 2 +- drivers/gpio/gpio-zynq.c | 2 +- 10 files changed, 12 insertions(+), 14 deletions(-)
drivers/gpio/gpio-bcm-kona.c +1 -1
@@ -432,7 +432,7 @@ static void bcm_kona_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)void __iomem *reg_base;int bit, bank_id;unsigned long sta; -struct bcm_kona_gpio_bank *bank =irq_get_handler_data (irq); +struct bcm_kona_gpio_bank *bank =irq_desc_get_handler_data (desc);struct irq_chip *chip =irq_desc_get_chip (desc);chained_irq_enter (chip, desc);
drivers/gpio/gpio-dwapb.c +1 -1
@@ -149,7 +149,7 @@ static u32 dwapb_do_irq(struct dwapb_gpio *gpio)static void dwapb_irq_handler (u32 irq,struct irq_desc *desc) { -struct dwapb_gpio *gpio =irq_get_handler_data (irq); +struct dwapb_gpio *gpio =irq_desc_get_handler_data (desc);struct irq_chip *chip =irq_desc_get_chip (desc);dwapb_do_irq (gpio);
drivers/gpio/gpio-mvebu.c +1 -1
@@ -460,7 +460,7 @@ static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type)static void mvebu_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) { -struct mvebu_gpio_chip *mvchip =irq_get_handler_data (irq); +struct mvebu_gpio_chip *mvchip =irq_desc_get_handler_data (desc);struct irq_chip *chip =irq_desc_get_chip (desc);u32 cause, type;int i;
drivers/gpio/gpio-mxc.c +3 -3
@@ -275,8 +275,8 @@ static void mxc_gpio_irq_handler(struct mxc_gpio_port *port, u32 irq_stat)static void mx3_gpio_irq_handler (u32 irq,struct irq_desc *desc) {u32 irq_stat; -struct mxc_gpio_port *port =irq_get_handler_data (irq); -struct irq_chip *chip =irq_get_chip (irq); +struct mxc_gpio_port *port =irq_desc_get_handler_data (desc); +struct irq_chip *chip =irq_desc_get_chip (desc);chained_irq_enter (chip, desc);
@@ -292,7 +292,7 @@ static void mx2_gpio_irq_handler(u32 irq, struct irq_desc *desc) {u32 irq_msk, irq_stat;struct mxc_gpio_port *port; -struct irq_chip *chip =irq_get_chip (irq); +struct irq_chip *chip =irq_desc_get_chip (desc);chained_irq_enter (chip, desc);
drivers/gpio/gpio-mxs.c +1 -1
@@ -157,7 +157,7 @@ static void mxs_flip_edge(struct mxs_gpio_port *port, u32 gpio)static void mxs_gpio_irq_handler (u32 irq,struct irq_desc *desc) {u32 irq_stat; -struct mxs_gpio_port *port =irq_get_handler_data (irq); +struct mxs_gpio_port *port =irq_desc_get_handler_data (desc); desc->irq_data.chip->irq_ack (&desc->irq_data);
drivers/gpio/gpio-omap.c +1 -1
@@ -719,7 +719,7 @@ static void omap_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)struct gpio_bank *bank;int unmasked =0 ;struct irq_chip *irqchip =irq_desc_get_chip (desc); -struct gpio_chip *chip =irq_get_handler_data (irq); +struct gpio_chip *chip =irq_desc_get_handler_data (desc);chained_irq_enter (irqchip, desc);
drivers/gpio/gpio-tegra.c +1 -3
@@ -268,16 +268,14 @@ static void tegra_gpio_irq_shutdown(struct irq_data *d)static void tegra_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) { -struct tegra_gpio_bank *bank;int port;int pin;int unmasked =0 ;struct irq_chip *chip =irq_desc_get_chip (desc); +struct tegra_gpio_bank *bank =irq_desc_get_handler_data (desc);chained_irq_enter (chip, desc); - bank =irq_get_handler_data (irq); -for (port =0 ; port <4 ; port++) {int gpio =tegra_gpio_compose (bank->bank, port,0 ); unsigned long sta = tegra_gpio_readl(GPIO_INT_STA(gpio)) &
drivers/gpio/gpio-timberdale.c +1 -1
@@ -194,7 +194,7 @@ out:static void timbgpio_irq (unsigned int irq,struct irq_desc *desc) { -struct timbgpio *tgpio =irq_get_handler_data (irq); +struct timbgpio *tgpio =irq_desc_get_handler_data (desc);unsigned long ipr;int offset;
drivers/gpio/gpio-vf610.c +1 -1
@@ -120,7 +120,7 @@ static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,static void vf610_gpio_irq_handler (u32 irq,struct irq_desc *desc) { -struct vf610_gpio_port *port =irq_get_handler_data (irq); +struct vf610_gpio_port *port =irq_desc_get_handler_data (desc);struct irq_chip *chip =irq_desc_get_chip (desc);int pin;unsigned long irq_isfr;
drivers/gpio/gpio-zynq.c +1 -1
@@ -499,7 +499,7 @@ static void zynq_gpio_irqhandler(unsigned int irq, struct irq_desc *desc) {u32 int_sts, int_enb;unsigned int bank_num; -struct zynq_gpio *gpio =irq_get_handler_data (irq); +struct zynq_gpio *gpio =irq_desc_get_handler_data (desc);struct irq_chip *irqchip =irq_desc_get_chip (desc);chained_irq_enter (irqchip, desc);
Signature · 1 line
1.7.10.4
Re: [RFC v1 05/25] gpio: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
Quoted 4 lines · Jiang Liu
Use
irq_desc_get_xxx()to avoid redundant lookup ofirq_descwhile we already have a pointer to correspondingirq_desc.Signed-off-by Jiang Liu <[email protected]>
Acked-by Linus Walleij <[email protected]>
Are there dependencies on this patch or can I just apply it directly to the GPIO tree?
Yours,
Linus Walleij
Re: [RFC v1 05/25] gpio: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
Quoted 11 lines · Linus Walleij
Quoted 4 lines · Jiang Liu
Use
irq_desc_get_xxx()to avoid redundant lookup ofirq_descwhile we already have a pointer to correspondingirq_desc.Signed-off-by Jiang Liu <[email protected]>Acked-by Linus Walleij <[email protected]>Are there dependencies on this patch or can I just apply it directly to the GPIO tree?
Hi Linus,
Thanks for review.
There's a very long dependency list of this patch set,
so it would be safer to merge this patch set altogether through the irq tree if that works:)
Thanks!
Gerry
Quoted 4 lines
Yours,
Linus Walleij
RFC 6/25 pinctrl: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
In reply to Jiang LiuUse irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we already have a pointer to corresponding irq_desc.
Signed-off-by Jiang Liu <[email protected]>
--- drivers/pinctrl/intel/pinctrl-cherryview.c | 2 +- drivers/pinctrl/intel/pinctrl-intel.c | 2 +- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 ++-- drivers/pinctrl/nomadik/pinctrl-nomadik.c | 12 +++++------- drivers/pinctrl/pinctrl-amd.c | 2 +- drivers/pinctrl/pinctrl-at91.c | 2 +- drivers/pinctrl/pinctrl-coh901.c | 4 ++-- drivers/pinctrl/pinctrl-rockchip.c | 4 ++-- drivers/pinctrl/pinctrl-single.c | 2 +- drivers/pinctrl/pinctrl-st.c | 6 +++--- drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- drivers/pinctrl/samsung/pinctrl-exynos.c | 8 ++++---- drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 18 +++++++++--------- drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 22 ++++++++++------------ drivers/pinctrl/sirf/pinctrl-sirf.c | 2 +- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 4 ++-- 16 files changed, 46 insertions(+), 50 deletions(-)
drivers/pinctrl/intel/pinctrl-cherryview.c +1 -1
@@ -1368,7 +1368,7 @@ static void chv_gpio_irq_handler(unsigned irq, struct irq_desc *desc) {struct gpio_chip *gc =irq_desc_get_handler_data (desc);struct chv_pinctrl *pctrl =gpiochip_to_pinctrl (gc); -struct irq_chip *chip =irq_get_chip (irq); +struct irq_chip *chip =irq_desc_get_chip (desc);unsigned long pending;u32 intr_line;
drivers/pinctrl/intel/pinctrl-intel.c +1 -1
@@ -840,7 +840,7 @@ static void intel_gpio_irq_handler(unsigned irq, struct irq_desc *desc) {struct gpio_chip *gc =irq_desc_get_handler_data (desc);struct intel_pinctrl *pctrl =gpiochip_to_pinctrl (gc); -struct irq_chip *chip =irq_get_chip (irq); +struct irq_chip *chip =irq_desc_get_chip (desc);int i;chained_irq_enter (chip, desc);
drivers/pinctrl/mediatek/pinctrl-mtk-common.c +2 -2
@@ -1018,8 +1018,8 @@ mtk_eint_debounce_process(struct mtk_pinctrl *pctl, int index)static void mtk_eint_irq_handler (unsigned irq,struct irq_desc *desc) { -struct irq_chip *chip =irq_get_chip (irq); -struct mtk_pinctrl *pctl =irq_get_handler_data (irq); +struct irq_chip *chip =irq_desc_get_chip (desc); +struct mtk_pinctrl *pctl =irq_desc_get_handler_data (desc);unsigned int status, eint_num;int offset, index, virq; const struct mtk_eint_offsets *eint_offsets =
drivers/pinctrl/nomadik/pinctrl-nomadik.c +5 -7
@@ -854,10 +854,9 @@ static struct irq_chip nmk_gpio_irq_chip = { .flags = IRQCHIP_MASK_ON_SUSPEND, }; -static void __nmk_gpio_irq_handler (unsigned int irq,struct irq_desc *desc, -u32 status) +static void __nmk_gpio_irq_handler (struct irq_desc *desc,u32 status) { -struct irq_chip *host_chip =irq_get_chip (irq); +struct irq_chip *host_chip =irq_desc_get_chip (desc);struct gpio_chip *chip =irq_desc_get_handler_data (desc);chained_irq_enter (host_chip, desc);
@@ -882,17 +881,16 @@ static void nmk_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) status =readl (nmk_chip->addr +NMK_GPIO_IS );clk_disable (nmk_chip->clk); -__nmk_gpio_irq_handler (irq, desc, status); +__nmk_gpio_irq_handler (desc, status); } -static void nmk_gpio_latent_irq_handler (unsigned int irq, -struct irq_desc *desc) +static void nmk_gpio_latent_irq_handler (unsigned int irq,struct irq_desc *desc) {struct gpio_chip *chip =irq_desc_get_handler_data (desc); struct nmk_gpio_chip *nmk_chip = container_of(chip, struct nmk_gpio_chip, chip);u32 status = nmk_chip->get_latent_status (nmk_chip->bank); -__nmk_gpio_irq_handler (irq, desc, status); +__nmk_gpio_irq_handler (desc, status); }/* I/O Functions */
drivers/pinctrl/pinctrl-amd.c +1 -1
@@ -501,7 +501,7 @@ static void amd_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)u64 reg64;int handled =0 ;unsigned long flags; -struct irq_chip *chip =irq_get_chip (irq); +struct irq_chip *chip =irq_desc_get_chip (desc);struct gpio_chip *gc =irq_desc_get_handler_data (desc);struct amd_gpio *gpio_dev =to_amd_gpio (gc);
drivers/pinctrl/pinctrl-at91.c +1 -1
@@ -1581,7 +1581,7 @@ static struct irq_chip gpio_irqchip = {static void gpio_irq_handler (unsigned irq,struct irq_desc *desc) { -struct irq_chip *chip =irq_get_chip (irq); +struct irq_chip *chip =irq_desc_get_chip (desc);struct gpio_chip *gpio_chip =irq_desc_get_handler_data (desc);struct at91_gpio_chip *at91_gpio =container_of (gpio_chip, struct at91_gpio_chip, chip);
drivers/pinctrl/pinctrl-coh901.c +2 -2
@@ -521,8 +521,8 @@ static struct irq_chip u300_gpio_irqchip = {static void u300_gpio_irq_handler (unsigned irq,struct irq_desc *desc) { -struct irq_chip *parent_chip =irq_get_chip (irq); -struct gpio_chip *chip =irq_get_handler_data (irq); +struct irq_chip *parent_chip =irq_desc_get_chip (desc); +struct gpio_chip *chip =irq_desc_get_handler_data (desc);struct u300_gpio *gpio =to_u300_gpio (chip);struct u300_gpio_port *port = &gpio->ports[irq - chip->base];int pinoffset = port->number <<3 ;/* get the right stride */
drivers/pinctrl/pinctrl-rockchip.c +2 -2
@@ -1396,8 +1396,8 @@ static const struct gpio_chip rockchip_gpiolib_chip = {static void rockchip_irq_demux (unsigned int irq,struct irq_desc *desc) { -struct irq_chip *chip =irq_get_chip (irq); -struct rockchip_pin_bank *bank =irq_get_handler_data (irq); +struct irq_chip *chip =irq_desc_get_chip (desc); +struct rockchip_pin_bank *bank =irq_desc_get_handler_data (desc);u32 pend;dev_dbg (bank->drvdata->dev,"got irq for bank %s\n" , bank->name);
drivers/pinctrl/pinctrl-single.c +1 -1
@@ -1684,7 +1684,7 @@ static void pcs_irq_chain_handler(unsigned int irq, struct irq_desc *desc)struct pcs_soc_data *pcs_soc =irq_desc_get_handler_data (desc);struct irq_chip *chip; - chip =irq_get_chip (irq); + chip =irq_desc_get_chip (desc);chained_irq_enter (chip, desc);pcs_irq_handle (pcs_soc);/* REVISIT: export and add handle_bad_irq(irq, desc)? */
drivers/pinctrl/pinctrl-st.c +3 -3
@@ -1463,7 +1463,7 @@ static void __gpio_irq_handler(struct st_gpio_bank *bank)static void st_gpio_irq_handler (unsigned irq,struct irq_desc *desc) {/* interrupt dedicated per bank */ -struct irq_chip *chip =irq_get_chip (irq); +struct irq_chip *chip =irq_desc_get_chip (desc);struct gpio_chip *gc =irq_desc_get_handler_data (desc);struct st_gpio_bank *bank =gpio_chip_to_bank (gc);
@@ -1474,8 +1474,8 @@ static void st_gpio_irq_handler(unsigned irq, struct irq_desc *desc)static void st_gpio_irqmux_handler (unsigned irq,struct irq_desc *desc) { -struct irq_chip *chip =irq_get_chip (irq); -struct st_pinctrl *info =irq_get_handler_data (irq); +struct irq_chip *chip =irq_desc_get_chip (desc); +struct st_pinctrl *info =irq_desc_get_handler_data (desc);unsigned long status;int n;
drivers/pinctrl/qcom/pinctrl-msm.c +1 -1
@@ -769,7 +769,7 @@ static void msm_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)struct gpio_chip *gc =irq_desc_get_handler_data (desc);const struct msm_pingroup *g;struct msm_pinctrl *pctrl =to_msm_pinctrl (gc); -struct irq_chip *chip =irq_get_chip (irq); +struct irq_chip *chip =irq_desc_get_chip (desc);int irq_pin;int handled =0 ;u32 val;
drivers/pinctrl/samsung/pinctrl-exynos.c +4 -4
@@ -422,9 +422,9 @@ static const struct of_device_id exynos_wkup_irq_ids[] = {/* interrupt handler for wakeup interrupts 0..15 */ static void exynos_irq_eint0_15 (unsigned int irq,struct irq_desc *desc) { -struct exynos_weint_data *eintd =irq_get_handler_data (irq); +struct exynos_weint_data *eintd =irq_desc_get_handler_data (desc);struct samsung_pin_bank *bank = eintd->bank; -struct irq_chip *chip =irq_get_chip (irq); +struct irq_chip *chip =irq_desc_get_chip (desc);int eint_irq;chained_irq_enter (chip, desc);
@@ -454,8 +454,8 @@ static inline void exynos_irq_demux_eint(unsigned long pend,/* interrupt handler for wakeup interrupt 16 */ static void exynos_irq_demux_eint16_31 (unsigned int irq,struct irq_desc *desc) { -struct irq_chip *chip =irq_get_chip (irq); -struct exynos_muxed_weint_data *eintd =irq_get_handler_data (irq); +struct irq_chip *chip =irq_desc_get_chip (desc); +struct exynos_muxed_weint_data *eintd =irq_desc_get_handler_data (desc);struct samsung_pinctrl_drv_data *d = eintd->banks[0 ]->drvdata;unsigned long pend;unsigned long mask;
drivers/pinctrl/samsung/pinctrl-s3c24xx.c +9 -9
@@ -243,7 +243,7 @@ static struct irq_chip s3c2410_eint0_3_chip = {static void s3c2410_demux_eint0_3 (unsigned int irq,struct irq_desc *desc) {struct irq_data *data =irq_desc_get_irq_data (desc); -struct s3c24xx_eint_data *eint_data =irq_get_handler_data (irq); +struct s3c24xx_eint_data *eint_data =irq_desc_get_handler_data (desc);unsigned int virq;/* the first 4 eints have a simple 1 to 1 mapping */
@@ -297,9 +297,9 @@ static struct irq_chip s3c2412_eint0_3_chip = {static void s3c2412_demux_eint0_3 (unsigned int irq,struct irq_desc *desc) { -struct irq_chip *chip =irq_get_chip (irq); +struct s3c24xx_eint_data *eint_data =irq_desc_get_handler_data (desc);struct irq_data *data =irq_desc_get_irq_data (desc); -struct s3c24xx_eint_data *eint_data =irq_get_handler_data (irq); +struct irq_chip *chip =irq_data_get_irq_chip (data);unsigned int virq;chained_irq_enter (chip, desc);
@@ -357,11 +357,11 @@ static struct irq_chip s3c24xx_eint_chip = { .irq_set_type = s3c24xx_eint_type, }; -static inline void s3c24xx_demux_eint (unsigned int irq,struct irq_desc *desc, +static inline void s3c24xx_demux_eint (struct irq_desc *desc,u32 offset,u32 range) { -struct irq_chip *chip =irq_get_chip (irq); -struct s3c24xx_eint_data *data =irq_get_handler_data (irq); +struct s3c24xx_eint_data *data =irq_desc_get_handler_data (desc); +struct irq_chip *chip =irq_desc_get_irq_chip (desc);struct samsung_pinctrl_drv_data *d = data->drvdata;unsigned int pend, mask;
@@ -375,8 +375,8 @@ static inline void s3c24xx_demux_eint(unsigned int irq, struct irq_desc *desc,while (pend) {unsigned int virq; +unsigned int irq =__ffs (pend); - irq =__ffs (pend); pend &= ~(1 << irq); virq =irq_linear_revmap (data->domains[irq], irq - offset);/* Something is really wrong if an unmapped EINT is unmasked */
@@ -390,12 +390,12 @@ static inline void s3c24xx_demux_eint(unsigned int irq, struct irq_desc *desc,static void s3c24xx_demux_eint4_7 (unsigned int irq,struct irq_desc *desc) { -s3c24xx_demux_eint (irq, desc,0 ,0xf0 ); +s3c24xx_demux_eint (desc,0 ,0xf0 ); }static void s3c24xx_demux_eint8_23 (unsigned int irq,struct irq_desc *desc) { -s3c24xx_demux_eint (irq, desc,8 ,0xffff00 ); +s3c24xx_demux_eint (desc,8 ,0xffff00 ); }static irq_flow_handler_t s3c2410_eint_handlers[NUM_EINT_IRQ ] = {
drivers/pinctrl/samsung/pinctrl-s3c64xx.c +10 -12
@@ -410,8 +410,8 @@ static const struct irq_domain_ops s3c64xx_gpio_irqd_ops = {static void s3c64xx_eint_gpio_irq (unsigned int irq,struct irq_desc *desc) { -struct irq_chip *chip =irq_get_chip (irq); -struct s3c64xx_eint_gpio_data *data =irq_get_handler_data (irq); +struct irq_chip *chip =irq_desc_get_chip (desc); +struct s3c64xx_eint_gpio_data *data =irq_desc_get_handler_data (desc);struct samsung_pinctrl_drv_data *drvdata = data->drvdata;chained_irq_enter (chip, desc);
@@ -600,11 +600,10 @@ static struct irq_chip s3c64xx_eint0_irq_chip = { .irq_set_type = s3c64xx_eint0_irq_set_type, }; -static inline void s3c64xx_irq_demux_eint (unsigned int irq, -struct irq_desc *desc,u32 range) +static inline void s3c64xx_irq_demux_eint (struct irq_desc *desc,u32 range) { -struct irq_chip *chip =irq_get_chip (irq); -struct s3c64xx_eint0_data *data =irq_get_handler_data (irq); +struct irq_chip *chip =irq_desc_get_chip (desc); +struct s3c64xx_eint0_data *data =irq_desc_get_handler_data (desc);struct samsung_pinctrl_drv_data *drvdata = data->drvdata;unsigned int pend, mask;
@@ -618,10 +617,9 @@ static inline void s3c64xx_irq_demux_eint(unsigned int irq,while (pend) {unsigned int virq; +unsigned int irq =fls (pend) -1 ; - irq =fls (pend) -1 ; pend &= ~(1 << irq); - virq =irq_linear_revmap (data->domains[irq], data->pins[irq]);/* * Something must be really wrong if an unmapped EINT
@@ -637,22 +635,22 @@ static inline void s3c64xx_irq_demux_eint(unsigned int irq,static void s3c64xx_demux_eint0_3 (unsigned int irq,struct irq_desc *desc) { -s3c64xx_irq_demux_eint (irq, desc,0xf ); +s3c64xx_irq_demux_eint (desc,0xf ); }static void s3c64xx_demux_eint4_11 (unsigned int irq,struct irq_desc *desc) { -s3c64xx_irq_demux_eint (irq, desc,0xff0 ); +s3c64xx_irq_demux_eint (desc,0xff0 ); }static void s3c64xx_demux_eint12_19 (unsigned int irq,struct irq_desc *desc) { -s3c64xx_irq_demux_eint (irq, desc,0xff000 ); +s3c64xx_irq_demux_eint (desc,0xff000 ); }static void s3c64xx_demux_eint20_27 (unsigned int irq,struct irq_desc *desc) { -s3c64xx_irq_demux_eint (irq, desc,0xff00000 ); +s3c64xx_irq_demux_eint (desc,0xff00000 ); }static irq_flow_handler_t s3c64xx_eint0_handlers[NUM_EINT0_IRQ ] = {
drivers/pinctrl/sirf/pinctrl-sirf.c +1 -1
@@ -552,7 +552,7 @@ static void sirfsoc_gpio_handle_irq(unsigned int irq, struct irq_desc *desc)struct sirfsoc_gpio_bank *bank;u32 status, ctrl;int idx =0 ; -struct irq_chip *chip =irq_get_chip (irq); +struct irq_chip *chip =irq_desc_get_chip (desc);int i;for (i =0 ; i <SIRFSOC_GPIO_NO_OF_BANKS ; i++) {
drivers/pinctrl/sunxi/pinctrl-sunxi.c +2 -2
@@ -711,8 +711,8 @@ static struct irq_chip sunxi_pinctrl_level_irq_chip = {static void sunxi_pinctrl_irq_handler (unsigned irq,struct irq_desc *desc) { -struct irq_chip *chip =irq_get_chip (irq); -struct sunxi_pinctrl *pctl =irq_get_handler_data (irq); +struct irq_chip *chip =irq_desc_get_chip (desc); +struct sunxi_pinctrl *pctl =irq_desc_get_handler_data (desc);unsigned long bank, reg, val;for (bank =0 ; bank < pctl->desc->irq_banks; bank++)
Signature · 1 line
1.7.10.4
Re: [RFC v1 06/25] pinctrl: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
Quoted 4 lines · Jiang Liu
Use
irq_desc_get_xxx()to avoid redundant lookup ofirq_descwhile we already have a pointer to correspondingirq_desc.Signed-off-by Jiang Liu <[email protected]>
Acked-by Linus Walleij <[email protected]>
Are there dependencies on this patch or can I just apply it directly to the GPIO tree?
Yours,
Linus Walleij
RFC 7/25 irqchip: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
In reply to Jiang LiuUse irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we already have a pointer to corresponding irq_desc.
Signed-off-by Jiang Liu <[email protected]>
--- drivers/irqchip/exynos-combiner.c | 4 ++-- drivers/irqchip/irq-armada-370-xp.c | 2 +- drivers/irqchip/irq-dw-apb-ictl.c | 4 ++-- drivers/irqchip/irq-gic.c | 4 ++-- drivers/irqchip/irq-orion.c | 2 +- drivers/irqchip/irq-sunxi-nmi.c | 2 +- drivers/irqchip/spear-shirq.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-)
drivers/irqchip/exynos-combiner.c +2 -2
@@ -62,8 +62,8 @@ static void combiner_unmask_irq(struct irq_data *data)static void combiner_handle_cascade_irq (unsigned int irq,struct irq_desc *desc) { -struct combiner_chip_data *chip_data =irq_get_handler_data (irq); -struct irq_chip *chip =irq_get_chip (irq); +struct combiner_chip_data *chip_data =irq_desc_get_handler_data (desc); +struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq, combiner_irq;unsigned long status;
drivers/irqchip/irq-armada-370-xp.c +1 -1
@@ -451,7 +451,7 @@ static void armada_370_xp_handle_msi_irq(struct pt_regs *r, bool b) {}static void armada_370_xp_mpic_handle_cascade_irq (unsigned int irq,struct irq_desc *desc) { -struct irq_chip *chip =irq_get_chip (irq); +struct irq_chip *chip =irq_desc_get_chip (desc);unsigned long irqmap, irqn, irqsrc, cpuid;unsigned int cascade_irq;
drivers/irqchip/irq-dw-apb-ictl.c +2 -2
@@ -28,8 +28,8 @@static void dw_apb_ictl_handler (unsigned int irq,struct irq_desc *desc) { -struct irq_chip *chip =irq_get_chip (irq); -struct irq_chip_generic *gc =irq_get_handler_data (irq); +struct irq_chip *chip =irq_desc_get_chip (desc); +struct irq_chip_generic *gc =irq_desc_get_handler_data (desc);struct irq_domain *d = gc->private;u32 stat;int n;
drivers/irqchip/irq-gic.c +2 -2
@@ -288,8 +288,8 @@ static void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)static void gic_handle_cascade_irq (unsigned int irq,struct irq_desc *desc) { -struct gic_chip_data *chip_data =irq_get_handler_data (irq); -struct irq_chip *chip =irq_get_chip (irq); +struct gic_chip_data *chip_data =irq_desc_get_handler_data (desc); +struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq, gic_irq;unsigned long status;
drivers/irqchip/irq-orion.c +1 -1
@@ -109,7 +109,7 @@ IRQCHIP_DECLARE(orion_intc, "marvell,orion-intc", orion_irq_init);static void orion_bridge_irq_handler (unsigned int irq,struct irq_desc *desc) { -struct irq_domain *d =irq_get_handler_data (irq); +struct irq_domain *d =irq_desc_get_handler_data (desc);struct irq_chip_generic *gc =irq_get_domain_generic_chip (d,0 ); u32 stat = readl_relaxed(gc->reg_base + ORION_BRIDGE_IRQ_CAUSE) &
drivers/irqchip/irq-sunxi-nmi.c +1 -1
@@ -61,7 +61,7 @@ static inline u32 sunxi_sc_nmi_read(struct irq_chip_generic *gc, u32 off)static void sunxi_sc_nmi_handle_irq (unsigned int irq,struct irq_desc *desc) {struct irq_domain *domain =irq_desc_get_handler_data (desc); -struct irq_chip *chip =irq_get_chip (irq); +struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int virq =irq_find_mapping (domain,0 );chained_irq_enter (chip, desc);
drivers/irqchip/spear-shirq.c +1 -1
@@ -185,7 +185,7 @@ static struct spear_shirq *spear320_shirq_blocks[] = {static void shirq_handler (unsigned irq,struct irq_desc *desc) { -struct spear_shirq *shirq =irq_get_handler_data (irq); +struct spear_shirq *shirq =irq_desc_get_handler_data (desc);u32 pend; pend =readl (shirq->base + shirq->status_reg) & shirq->mask;
Signature · 1 line
1.7.10.4
RFC 8/25 mfd: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
In reply to Jiang LiuUse irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we already have a pointer to corresponding irq_desc.
Do the same thing to avoid pattern "irq_get_chip_data(data->irq)".
Signed-off-by Jiang Liu <[email protected]>
--- drivers/mfd/ezx-pcap.c | 2 +- drivers/mfd/max8997-irq.c | 8 ++++---- drivers/mfd/mt6397-core.c | 8 ++++---- drivers/mfd/t7l66xb.c | 2 +- drivers/mfd/tc6393xb.c | 2 +- drivers/mfd/twl6030-irq.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-)
drivers/mfd/ezx-pcap.c +1 -1
@@ -207,7 +207,7 @@ static void pcap_isr_work(struct work_struct *work)static void pcap_irq_handler (unsigned int irq,struct irq_desc *desc) { -struct pcap_chip *pcap =irq_get_handler_data (irq); +struct pcap_chip *pcap =irq_desc_get_handler_data (desc); desc->irq_data.chip->irq_ack (&desc->irq_data);queue_work (pcap->workqueue, &pcap->isr_work);
drivers/mfd/max8997-irq.c +4 -4
@@ -113,14 +113,14 @@ static const struct max8997_irq_data max8997_irqs[] = {static void max8997_irq_lock (struct irq_data *data) { -struct max8997_dev *max8997 =irq_get_chip_data (data->irq); +struct max8997_dev *max8997 =irq_data_get_irq_chip_data (data);mutex_lock (&max8997->irqlock); }static void max8997_irq_sync_unlock (struct irq_data *data) { -struct max8997_dev *max8997 =irq_get_chip_data (data->irq); +struct max8997_dev *max8997 =irq_data_get_irq_chip_data (data);int i;for (i =0 ; i <MAX8997_IRQ_GROUP_NR ; i++) {
@@ -148,7 +148,7 @@ irq_to_max8997_irq(struct max8997_dev *max8997, int irq)static void max8997_irq_mask (struct irq_data *data) { -struct max8997_dev *max8997 =irq_get_chip_data (data->irq); +struct max8997_dev *max8997 =irq_data_get_irq_chip_data (data);const struct max8997_irq_data *irq_data =irq_to_max8997_irq (max8997, data->irq);
@@ -157,7 +157,7 @@ static void max8997_irq_mask(struct irq_data *data)static void max8997_irq_unmask (struct irq_data *data) { -struct max8997_dev *max8997 =irq_get_chip_data (data->irq); +struct max8997_dev *max8997 =irq_data_get_irq_chip_data (data);const struct max8997_irq_data *irq_data =irq_to_max8997_irq (max8997, data->irq);
drivers/mfd/mt6397-core.c +4 -4
@@ -39,14 +39,14 @@ static const struct mfd_cell mt6397_devs[] = {static void mt6397_irq_lock (struct irq_data *data) { -struct mt6397_chip *mt6397 =irq_get_chip_data (data->irq); +struct mt6397_chip *mt6397 =irq_data_get_irq_chip_data (data);mutex_lock (&mt6397->irqlock); }static void mt6397_irq_sync_unlock (struct irq_data *data) { -struct mt6397_chip *mt6397 =irq_get_chip_data (data->irq); +struct mt6397_chip *mt6397 =irq_data_get_irq_chip_data (data);regmap_write (mt6397->regmap,MT6397_INT_CON0 , mt6397->irq_masks_cur[0 ]);regmap_write (mt6397->regmap,MT6397_INT_CON1 , mt6397->irq_masks_cur[1 ]);
@@ -56,7 +56,7 @@ static void mt6397_irq_sync_unlock(struct irq_data *data)static void mt6397_irq_disable (struct irq_data *data) { -struct mt6397_chip *mt6397 =irq_get_chip_data (data->irq); +struct mt6397_chip *mt6397 =irq_data_get_irq_chip_data (data);int shift = data->hwirq &0xf ;int reg = data->hwirq >>4 ;
@@ -65,7 +65,7 @@ static void mt6397_irq_disable(struct irq_data *data)static void mt6397_irq_enable (struct irq_data *data) { -struct mt6397_chip *mt6397 =irq_get_chip_data (data->irq); +struct mt6397_chip *mt6397 =irq_data_get_irq_chip_data (data);int shift = data->hwirq &0xf ;int reg = data->hwirq >>4 ;
drivers/mfd/t7l66xb.c +1 -1
@@ -187,7 +187,7 @@ static struct mfd_cell t7l66xb_cells[] = {/* Handle the T7L66XB interrupt mux */ static void t7l66xb_irq (unsigned int irq,struct irq_desc *desc) { -struct t7l66xb *t7l66xb =irq_get_handler_data (irq); +struct t7l66xb *t7l66xb =irq_desc_get_handler_data (desc);unsigned int isr;unsigned int i, irq_base;
drivers/mfd/tc6393xb.c +1 -1
@@ -525,7 +525,7 @@ static int tc6393xb_register_gpio(struct tc6393xb *tc6393xb, int gpio_base)static void tc6393xb_irq (unsigned int irq,struct irq_desc *desc) { -struct tc6393xb *tc6393xb =irq_get_handler_data (irq); +struct tc6393xb *tc6393xb =irq_desc_get_handler_data (desc);unsigned int isr;unsigned int i, irq_base;
drivers/mfd/twl6030-irq.c +1 -1
@@ -231,7 +231,7 @@ static irqreturn_t twl6030_irq_thread(int irq, void *data)static int twl6030_irq_set_wake (struct irq_data *d,unsigned int on) { -struct twl6030_irq *pdata =irq_get_chip_data (d->irq); +struct twl6030_irq *pdata =irq_data_get_irq_chip_data (d);if (on)atomic_inc (&pdata->wakeirqs);
Signature · 1 line
1.7.10.4
Re: [RFC v1 08/25] mfd: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
Quoted 6 lines · Jiang Liu
Use
irq_desc_get_xxx()to avoid redundant lookup ofirq_descwhile we already have a pointer to correspondingirq_desc.Do the same thing to avoid pattern "
irq_get_chip_data(data->irq)".Signed-off-by Jiang Liu <[email protected]>
Quoted 8 lines
--- drivers/mfd/ezx-pcap.c | 2 +- drivers/mfd/max8997-irq.c | 8 ++++---- drivers/mfd/mt6397-core.c | 8 ++++---- drivers/mfd/t7l66xb.c | 2 +- drivers/mfd/tc6393xb.c | 2 +- drivers/mfd/twl6030-irq.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-)
Again, so long as this has been properly tested:
Acked-by Lee Jones <[email protected]>
Quoted 130 lines
drivers/mfd/ezx-pcap.c +1
-1@@ -207,7 +207,7 @@ static void pcap_isr_work(struct work_struct *work)static void pcap_irq_handler (unsigned int irq,struct irq_desc *desc) { -struct pcap_chip *pcap =irq_get_handler_data (irq); +struct pcap_chip *pcap =irq_desc_get_handler_data (desc); desc->irq_data.chip->irq_ack (&desc->irq_data);queue_work (pcap->workqueue, &pcap->isr_work);drivers/mfd/max8997-irq.c +4
-4@@ -113,14 +113,14 @@ static const struct max8997_irq_data max8997_irqs[] = {static void max8997_irq_lock (struct irq_data *data) { -struct max8997_dev *max8997 =irq_get_chip_data (data->irq); +struct max8997_dev *max8997 =irq_data_get_irq_chip_data (data);mutex_lock (&max8997->irqlock); }static void max8997_irq_sync_unlock (struct irq_data *data) { -struct max8997_dev *max8997 =irq_get_chip_data (data->irq); +struct max8997_dev *max8997 =irq_data_get_irq_chip_data (data);int i;for (i =0 ; i <MAX8997_IRQ_GROUP_NR ; i++) {@@ -148,7 +148,7 @@ irq_to_max8997_irq(struct max8997_dev *max8997, int irq)static void max8997_irq_mask (struct irq_data *data) { -struct max8997_dev *max8997 =irq_get_chip_data (data->irq); +struct max8997_dev *max8997 =irq_data_get_irq_chip_data (data);const struct max8997_irq_data *irq_data =irq_to_max8997_irq (max8997, data->irq);@@ -157,7 +157,7 @@ static void max8997_irq_mask(struct irq_data *data)static void max8997_irq_unmask (struct irq_data *data) { -struct max8997_dev *max8997 =irq_get_chip_data (data->irq); +struct max8997_dev *max8997 =irq_data_get_irq_chip_data (data);const struct max8997_irq_data *irq_data =irq_to_max8997_irq (max8997, data->irq);drivers/mfd/mt6397-core.c +4
-4@@ -39,14 +39,14 @@ static const struct mfd_cell mt6397_devs[] = {static void mt6397_irq_lock (struct irq_data *data) { -struct mt6397_chip *mt6397 =irq_get_chip_data (data->irq); +struct mt6397_chip *mt6397 =irq_data_get_irq_chip_data (data);mutex_lock (&mt6397->irqlock); }static void mt6397_irq_sync_unlock (struct irq_data *data) { -struct mt6397_chip *mt6397 =irq_get_chip_data (data->irq); +struct mt6397_chip *mt6397 =irq_data_get_irq_chip_data (data);regmap_write (mt6397->regmap,MT6397_INT_CON0 , mt6397->irq_masks_cur[0 ]);regmap_write (mt6397->regmap,MT6397_INT_CON1 , mt6397->irq_masks_cur[1 ]);@@ -56,7 +56,7 @@ static void mt6397_irq_sync_unlock(struct irq_data *data)static void mt6397_irq_disable (struct irq_data *data) { -struct mt6397_chip *mt6397 =irq_get_chip_data (data->irq); +struct mt6397_chip *mt6397 =irq_data_get_irq_chip_data (data);int shift = data->hwirq &0xf ;int reg = data->hwirq >>4 ;@@ -65,7 +65,7 @@ static void mt6397_irq_disable(struct irq_data *data)static void mt6397_irq_enable (struct irq_data *data) { -struct mt6397_chip *mt6397 =irq_get_chip_data (data->irq); +struct mt6397_chip *mt6397 =irq_data_get_irq_chip_data (data);int shift = data->hwirq &0xf ;int reg = data->hwirq >>4 ;drivers/mfd/t7l66xb.c +1
-1@@ -187,7 +187,7 @@ static struct mfd_cell t7l66xb_cells[] = {/* Handle the T7L66XB interrupt mux */ static void t7l66xb_irq (unsigned int irq,struct irq_desc *desc) { -struct t7l66xb *t7l66xb =irq_get_handler_data (irq); +struct t7l66xb *t7l66xb =irq_desc_get_handler_data (desc);unsigned int isr;unsigned int i, irq_base;drivers/mfd/tc6393xb.c +1
-1@@ -525,7 +525,7 @@ static int tc6393xb_register_gpio(struct tc6393xb *tc6393xb, int gpio_base)static void tc6393xb_irq (unsigned int irq,struct irq_desc *desc) { -struct tc6393xb *tc6393xb =irq_get_handler_data (irq); +struct tc6393xb *tc6393xb =irq_desc_get_handler_data (desc);unsigned int isr;unsigned int i, irq_base;drivers/mfd/twl6030-irq.c +1
-1@@ -231,7 +231,7 @@ static irqreturn_t twl6030_irq_thread(int irq, void *data)static int twl6030_irq_set_wake (struct irq_data *d,unsigned int on) { -struct twl6030_irq *pdata =irq_get_chip_data (d->irq); +struct twl6030_irq *pdata =irq_data_get_irq_chip_data (d);if (on)atomic_inc (&pdata->wakeirqs);
Signature · 8 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
RFC 9/25 ipu: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
In reply to Jiang LiuUse irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we already have a pointer to corresponding irq_desc.
Do the same thing to avoid pattern "irq_get_chip_data(data->irq)".
Signed-off-by Jiang Liu <[email protected]>
--- drivers/dma/ipu/ipu_irq.c | 2 +- drivers/gpu/ipu-v3/ipu-common.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/dma/ipu/ipu_irq.c +1 -1
@@ -268,7 +268,7 @@ int ipu_irq_unmap(unsigned int source)/* Chained IRQ handler for IPU error interrupt */ static void ipu_irq_err (unsigned int irq,struct irq_desc *desc) { -struct ipu *ipu =irq_get_handler_data (irq); +struct ipu *ipu =irq_desc_get_handler_data (desc);u32 status;int i, line;
drivers/gpu/ipu-v3/ipu-common.c +2 -2
@@ -915,8 +915,8 @@ static void ipu_irq_handle(struct ipu_soc *ipu, const int *regs, int num_regs)static void ipu_irq_handler (unsigned int irq,struct irq_desc *desc) {struct ipu_soc *ipu =irq_desc_get_handler_data (desc); +struct irq_chip *chip =irq_desc_get_chip (desc);const int int_reg[] = {0 ,1 ,2 ,3 ,10 ,11 ,12 ,13 ,14 }; -struct irq_chip *chip =irq_get_chip (irq);chained_irq_enter (chip, desc);
@@ -928,8 +928,8 @@ static void ipu_irq_handler(unsigned int irq, struct irq_desc *desc)static void ipu_err_irq_handler (unsigned int irq,struct irq_desc *desc) {struct ipu_soc *ipu =irq_desc_get_handler_data (desc); +struct irq_chip *chip =irq_desc_get_chip (desc);const int int_reg[] = {4 ,5 ,8 ,9 }; -struct irq_chip *chip =irq_get_chip (irq);chained_irq_enter (chip, desc);
Signature · 1 line
1.7.10.4
RFC 10/25 sh: intc: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
In reply to Jiang LiuUse irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we already have a pointer to corresponding irq_desc.
Also replace generic_handle_irq with generic_handle_irq_desc() to avoid looking up irq_desc again.
Signed-off-by Jiang Liu <[email protected]>
--- drivers/sh/intc/core.c | 2 +- drivers/sh/intc/virq.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-)
drivers/sh/intc/core.c +1 -1
@@ -67,7 +67,7 @@ void intc_set_prio_level(unsigned int irq, unsigned int level)static void intc_redirect_irq (unsigned int irq,struct irq_desc *desc) { -generic_handle_irq ((unsigned int )irq_get_handler_data (irq)); +generic_handle_irq_desc (irq, desc); } static void __init intc_register_irq(struct intc_desc *desc,
drivers/sh/intc/virq.c +8 -6
@@ -109,7 +109,7 @@ static int add_virq_to_pirq(unsigned int irq, unsigned int virq)static void intc_virq_handler (unsigned int irq,struct irq_desc *desc) { -struct irq_data *data =irq_get_irq_data (irq); +struct irq_data *data =irq_desc_get_irq_data (desc);struct irq_chip *chip =irq_data_get_irq_chip (data);struct intc_virq_list *entry, *vlist =irq_data_get_irq_handler_data (data);struct intc_desc_int *d =get_intc_desc (irq);
@@ -118,12 +118,14 @@ static void intc_virq_handler(unsigned int irq, struct irq_desc *desc)for_each_virq (entry, vlist) {unsigned long addr, handle; +struct irq_desc *vdesc =irq_to_desc (entry->irq); - handle = (unsigned long )irq_get_handler_data (entry->irq); - addr =INTC_REG (d,_INTC_ADDR_E (handle),0 ); - -if (intc_reg_fns[_INTC_FN (handle)](addr, handle,0 )) -generic_handle_irq (entry->irq); +if (vdesc) { + handle = (unsigned long )irq_desc_get_handler_data (vdesc); + addr =INTC_REG (d,_INTC_ADDR_E (handle),0 ); +if (intc_reg_fns[_INTC_FN (handle)](addr, handle,0 )) +generic_handle_irq_desc (entry->irq, vdesc); + } } chip->irq_unmask (data);
Signature · 1 line
1.7.10.4
Re: [RFC v1 10/25] sh: intc: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
Quoted 17 lines · Jiang Liu
Use
irq_desc_get_xxx()to avoid redundant lookup ofirq_descwhile we already have a pointer to correspondingirq_desc.Also replace
generic_handle_irqwithgeneric_handle_irq_desc()to avoid looking upirq_descagain.Signed-off-by Jiang Liu <[email protected]>--- drivers/sh/intc/core.c | 2 +- drivers/sh/intc/virq.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-)drivers/sh/intc/core.c +0
-0
drivers/sh/intc/core.c void intc_set_prio_level(unsigned int irq, unsigned int level) · line 70
Quoted 5 lines
drivers/sh/intc/core.c +1
-1@@ -67,7 +67,7 @@ void intc_set_prio_level(unsigned int irq, unsigned int level)static void intc_redirect_irq (unsigned int irq,struct irq_desc *desc) { -generic_handle_irq ((unsigned int )irq_get_handler_data (irq)); +generic_handle_irq_desc (irq, desc);
This looks wrong. It's a redirector of irq to some other irq.
redir_irq = (unsigned int)irq_get_handler_data(irq);
which should be:
redir_irq = (unsigned int)irq_desc_get_irq_handler_data(desc);
And redir_irq is certainly not the same as irq. So this wants a conversion to irq_desc_get_irq_handler_data() first. That makes the irq argument unused.
Thanks,
tglx
Re: [RFC v1 10/25] sh: intc: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
Quoted 29 lines · Thomas Gleixner
Quoted 17 lines · Jiang Liu
Use
irq_desc_get_xxx()to avoid redundant lookup ofirq_descwhile we already have a pointer to correspondingirq_desc.Also replace
generic_handle_irqwithgeneric_handle_irq_desc()to avoid looking upirq_descagain.Signed-off-by Jiang Liu <[email protected]>--- drivers/sh/intc/core.c | 2 +- drivers/sh/intc/virq.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-)drivers/sh/intc/core.c +0
-0drivers/sh/intc/core.c void intc_set_prio_level(unsigned int irq, unsigned int level) · line 70
Quoted 5 lines
drivers/sh/intc/core.c +1
-1@@ -67,7 +67,7 @@ void intc_set_prio_level(unsigned int irq, unsigned int level)static void intc_redirect_irq (unsigned int irq,struct irq_desc *desc) { -generic_handle_irq ((unsigned int )irq_get_handler_data (irq)); +generic_handle_irq_desc (irq, desc);This looks wrong. It's a redirector of irq to some other irq.
redir_irq = (unsigned int)irq_get_handler_data(irq);
Quoted 7 lines
which should be:
redir_irq = (unsigned int)irq_desc_get_irq_handler_data(desc);And
redir_irqis certainly not the same as irq. So this wants a conversion toirq_desc_get_irq_handler_data()first. That makes the irq argument unused.
Good catch, will fix it in next version.
Quoted 5 lines
Thanks,
tglx
RFC 11/25 keystone, irq: Use irq_data_get_xxx() to avoid redundant lookup of irq_data
In reply to Jiang LiuUse irq_data_get_xxx() to avoid redundant lookup of irq_data while we already have a pointer to corresponding irq_data.
Signed-off-by Jiang Liu <[email protected]>
--- drivers/pci/host/pci-keystone-dw.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/pci/host/pci-keystone-dw.c +6 -9
@@ -104,14 +104,13 @@ static void ks_dw_pcie_msi_irq_ack(struct irq_data *d) {u32 offset, reg_offset, bit_pos;struct keystone_pcie *ks_pcie; -unsigned int irq = d->irq;struct msi_desc *msi;struct pcie_port *pp; - msi =irq_get_msi_desc (irq); + msi =irq_data_get_msi_desc (d); pp =sys_to_pcie (msi->dev->bus->sysdata); ks_pcie =to_keystone_pcie (pp); - offset = irq -irq_linear_revmap (pp->irq_domain,0 ); + offset = d->irq -irq_linear_revmap (pp->irq_domain,0 );update_reg_offset_bit_pos (offset, ®_offset, &bit_pos); writel(BIT(bit_pos),
@@ -142,15 +141,14 @@ void ks_dw_pcie_msi_clear_irq(struct pcie_port *pp, int irq)static void ks_dw_pcie_msi_irq_mask (struct irq_data *d) {struct keystone_pcie *ks_pcie; -unsigned int irq = d->irq;struct msi_desc *msi;struct pcie_port *pp;u32 offset; - msi =irq_get_msi_desc (irq); + msi =irq_data_get_msi_desc (d); pp =sys_to_pcie (msi->dev->bus->sysdata); ks_pcie =to_keystone_pcie (pp); - offset = irq -irq_linear_revmap (pp->irq_domain,0 ); + offset = d->irq -irq_linear_revmap (pp->irq_domain,0 );/* Mask the end point if PVM implemented */ if (IS_ENABLED (CONFIG_PCI_MSI )) {
@@ -164,15 +162,14 @@ static void ks_dw_pcie_msi_irq_mask(struct irq_data *d)static void ks_dw_pcie_msi_irq_unmask (struct irq_data *d) {struct keystone_pcie *ks_pcie; -unsigned int irq = d->irq;struct msi_desc *msi;struct pcie_port *pp;u32 offset; - msi =irq_get_msi_desc (irq); + msi =irq_data_get_msi_desc (d); pp =sys_to_pcie (msi->dev->bus->sysdata); ks_pcie =to_keystone_pcie (pp); - offset = irq -irq_linear_revmap (pp->irq_domain,0 ); + offset = d->irq -irq_linear_revmap (pp->irq_domain,0 );/* Mask the end point if PVM implemented */ if (IS_ENABLED (CONFIG_PCI_MSI )) {
Signature · 1 line
1.7.10.4
RFC 12/25 spmi: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
In reply to Jiang LiuUse irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we already have a pointer to corresponding irq_desc.
Signed-off-by Jiang Liu <[email protected]>
--- drivers/spmi/spmi-pmic-arb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spmi/spmi-pmic-arb.c +2 -2
@@ -453,8 +453,8 @@ static void periph_interrupt(struct spmi_pmic_arb_dev *pa, u8 apid)static void pmic_arb_chained_irq (unsigned int irq,struct irq_desc *desc) { -struct spmi_pmic_arb_dev *pa =irq_get_handler_data (irq); -struct irq_chip *chip =irq_get_chip (irq); +struct spmi_pmic_arb_dev *pa =irq_desc_get_handler_data (desc); +struct irq_chip *chip =irq_desc_get_chip (desc);void __iomem *intr = pa->intr;int first = pa->min_apid >>5 ;int last = pa->max_apid >>5 ;
Signature · 1 line
1.7.10.4
RFC 13/25 genirq: Kill the parameter 'irq' of kstat_incr_irqs_this_cpu()
In reply to Jiang LiuThe first parameter 'irq' is never used by kstat_incr_irqs_this_cpu(), so kill it. So one step further to kill the first parameter 'irq' of irq_flow_handler_t.
Signed-off-by Jiang Liu <[email protected]>
--- kernel/irq/chip.c | 16 ++++++++-------- kernel/irq/handle.c | 2 +- kernel/irq/internals.h | 2 +- kernel/irq/irqdesc.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-)
kernel/irq/chip.c +8 -8
@@ -315,7 +315,7 @@ void handle_nested_irq(unsigned int irq)raw_spin_lock_irq (&desc->lock); desc->istate &= ~(IRQS_REPLAY |IRQS_WAITING ); -kstat_incr_irqs_this_cpu (irq, desc); +kstat_incr_irqs_this_cpu (desc); action = desc->action;if (unlikely (!action ||irqd_irq_disabled (&desc->irq_data))) {
@@ -391,7 +391,7 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc) goto out_unlock; desc->istate &= ~(IRQS_REPLAY |IRQS_WAITING ); -kstat_incr_irqs_this_cpu (irq, desc); +kstat_incr_irqs_this_cpu (desc);if (unlikely (!desc->action ||irqd_irq_disabled (&desc->irq_data))) { desc->istate |=IRQS_PENDING ;
@@ -443,7 +443,7 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc) goto out_unlock; desc->istate &= ~(IRQS_REPLAY |IRQS_WAITING ); -kstat_incr_irqs_this_cpu (irq, desc); +kstat_incr_irqs_this_cpu (desc);/* * If its disabled or no action available
@@ -515,7 +515,7 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc) goto out; desc->istate &= ~(IRQS_REPLAY |IRQS_WAITING ); -kstat_incr_irqs_this_cpu (irq, desc); +kstat_incr_irqs_this_cpu (desc);/* * If its disabled or no action available
@@ -583,7 +583,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc) goto out_unlock; } -kstat_incr_irqs_this_cpu (irq, desc); +kstat_incr_irqs_this_cpu (desc);/* Start handling the irq */ desc->irq_data.chip->irq_ack (&desc->irq_data);
@@ -646,7 +646,7 @@ void handle_edge_eoi_irq(unsigned int irq, struct irq_desc *desc) goto out_eoi; } -kstat_incr_irqs_this_cpu (irq, desc); +kstat_incr_irqs_this_cpu (desc); do { if (unlikely(!desc->action))
@@ -675,7 +675,7 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc); -kstat_incr_irqs_this_cpu (irq, desc); +kstat_incr_irqs_this_cpu (desc);if (chip->irq_ack) chip->irq_ack (&desc->irq_data);
@@ -705,7 +705,7 @@ void handle_percpu_devid_irq(unsigned int irq, struct irq_desc *desc)void *dev_id =raw_cpu_ptr (action->percpu_dev_id);irqreturn_t res; -kstat_incr_irqs_this_cpu (irq, desc); +kstat_incr_irqs_this_cpu (desc);if (chip->irq_ack) chip->irq_ack (&desc->irq_data);
kernel/irq/handle.c +1 -1
@@ -30,7 +30,7 @@void handle_bad_irq (unsigned int irq,struct irq_desc *desc) {print_irq_desc (irq, desc); -kstat_incr_irqs_this_cpu (irq, desc); +kstat_incr_irqs_this_cpu (desc);ack_bad_irq (irq); }
kernel/irq/internals.h +1 -1
@@ -193,7 +193,7 @@ static inline bool irqd_has_set(struct irq_data *d, unsigned int mask)return __irqd_to_state (d) & mask; } -static inline void kstat_incr_irqs_this_cpu (unsigned int irq,struct irq_desc *desc) +static inline void kstat_incr_irqs_this_cpu (struct irq_desc *desc) {__this_cpu_inc (*desc->kstat_irqs);__this_cpu_inc (kstat.irqs_sum);
kernel/irq/irqdesc.c +1 -1
@@ -586,7 +586,7 @@ int irq_set_percpu_devid(unsigned int irq)void kstat_incr_irq_this_cpu (unsigned int irq) { -kstat_incr_irqs_this_cpu (irq,irq_to_desc (irq)); +kstat_incr_irqs_this_cpu (irq_to_desc (irq)); }/**
Signature · 1 line
1.7.10.4
Re: [RFC v1 13/25] genirq: Kill the parameter 'irq' of kstat_incr_irqs_this_cpu()
kernel/irq/internals.h static inline bool irqd_has_set(struct irq_data *d, unsigned int mask) · line 199
Quoted 13 lines · Jiang Liu
kernel/irq/internals.h +1
-1@@ -193,7 +193,7 @@ static inline bool irqd_has_set(struct irq_data *d, unsigned int mask)return __irqd_to_state (d) & mask; } -static inline void kstat_incr_irqs_this_cpu (unsigned int irq,struct irq_desc *desc) +static inline void kstat_incr_irqs_this_cpu (struct irq_desc *desc) {__this_cpu_inc (*desc->kstat_irqs);__this_cpu_inc (kstat.irqs_sum);
That hunk does not apply. Neither on mainline nor on tip/x86/apic
Thanks,
tglx
RFC 14/25 genirq: Kill the first parameter 'irq' of irq_flow_handler_t
In reply to Jiang LiuNow most IRQ flow handlers make no use of the first parameter 'irq'. And for those who do make use of 'irq', we could easily get the irq number through irq_desc->irq_data->irq. So kill the first parameter 'irq' of irq_flow_handler_t.
To ease review, I have split the changes into several parts, though they should be merge as one to support bisecting.
Signed-off-by Jiang Liu <[email protected]>
--- include/linux/irq.h | 16 ++++++++-------- include/linux/irqdesc.h | 9 +++++++-- include/linux/irqhandler.h | 2 +- kernel/irq/chip.c | 22 ++++++++-------------- kernel/irq/handle.c | 4 ++-- kernel/irq/irqdesc.c | 2 +- 6 files changed, 27 insertions(+), 28 deletions(-)
include/linux/irq.h +8 -8
@@ -458,14 +458,14 @@ static inline int irq_set_parent(int irq, int parent_irq)* Built-in IRQ handlers for various IRQ types, * callable via desc->handle_irq() */ -extern void handle_level_irq (unsigned int irq,struct irq_desc *desc); -extern void handle_fasteoi_irq (unsigned int irq,struct irq_desc *desc); -extern void handle_edge_irq (unsigned int irq,struct irq_desc *desc); -extern void handle_edge_eoi_irq (unsigned int irq,struct irq_desc *desc); -extern void handle_simple_irq (unsigned int irq,struct irq_desc *desc); -extern void handle_percpu_irq (unsigned int irq,struct irq_desc *desc); -extern void handle_percpu_devid_irq (unsigned int irq,struct irq_desc *desc); -extern void handle_bad_irq (unsigned int irq,struct irq_desc *desc); +extern void handle_level_irq (struct irq_desc *desc); +extern void handle_fasteoi_irq (struct irq_desc *desc); +extern void handle_edge_irq (struct irq_desc *desc); +extern void handle_edge_eoi_irq (struct irq_desc *desc); +extern void handle_simple_irq (struct irq_desc *desc); +extern void handle_percpu_irq (struct irq_desc *desc); +extern void handle_percpu_devid_irq (struct irq_desc *desc); +extern void handle_bad_irq (struct irq_desc *desc);extern void handle_nested_irq (unsigned int irq);extern int irq_chip_compose_msi_msg (struct irq_data *data,struct msi_msg *msg);
include/linux/irqdesc.h +7 -2
@@ -99,6 +99,11 @@ static inline struct irq_desc *irq_data_to_desc(struct irq_data *data) return container_of(data->common, struct irq_desc, irq_common_data); } +static inline unsigned int irq_desc_get_irq (struct irq_desc *desc) +{ +return desc->irq_data.irq; +} +static inline struct irq_data *irq_desc_get_irq_data (struct irq_desc *desc) {return &desc->irq_data;
@@ -130,9 +135,9 @@ static inline struct msi_desc *irq_desc_get_msi_desc(struct irq_desc *desc)* irqchip-style controller then we call the ->handle_irq() handler, * and it calls __do_IRQ() if it's attached to an irqtype-style controller. */ -static inline void generic_handle_irq_desc (unsigned int irq,struct irq_desc *desc) +static inline void generic_handle_irq_desc (struct irq_desc *desc) { - desc->handle_irq (irq, desc); + desc->handle_irq (desc); }int generic_handle_irq (unsigned int irq);
include/linux/irqhandler.h +1 -1
@@ -8,7 +8,7 @@struct irq_desc ;struct irq_data ; -typedef void (*irq_flow_handler_t )(unsigned int irq,struct irq_desc *desc); +typedef void (*irq_flow_handler_t )(struct irq_desc *desc);typedef void (*irq_preflow_handler_t )(struct irq_data *data);#endif
kernel/irq/chip.c +8 -14
@@ -372,7 +372,6 @@ static bool irq_may_run(struct irq_desc *desc)/** * handle_simple_irq - Simple and software-decoded IRQs. -* @irq: the interrupt number * @desc: the interrupt description structure for this irq * * Simple interrupts are either sent from a demultiplexing interrupt
@@ -383,7 +382,7 @@ static bool irq_may_run(struct irq_desc *desc)* unmask issues if necessary. */ void -handle_simple_irq (unsigned int irq,struct irq_desc *desc) +handle_simple_irq (struct irq_desc *desc) {raw_spin_lock (&desc->lock);
@@ -425,7 +424,6 @@ static void cond_unmask_irq(struct irq_desc *desc)/** * handle_level_irq - Level type irq handler -* @irq: the interrupt number * @desc: the interrupt description structure for this irq * * Level type interrupts are active as long as the hardware line has
@@ -434,7 +432,7 @@ static void cond_unmask_irq(struct irq_desc *desc)* interrupt line is back to inactive. */ void -handle_level_irq (unsigned int irq,struct irq_desc *desc) +handle_level_irq (struct irq_desc *desc) {raw_spin_lock (&desc->lock);mask_ack_irq (desc);
@@ -496,7 +494,6 @@ static void cond_unmask_eoi_irq(struct irq_desc *desc, struct irq_chip *chip)/** * handle_fasteoi_irq - irq handler for transparent controllers -* @irq: the interrupt number * @desc: the interrupt description structure for this irq * * Only a single callback will be issued to the chip: an ->eoi()
@@ -505,7 +502,7 @@ static void cond_unmask_eoi_irq(struct irq_desc *desc, struct irq_chip *chip)* details in hardware, transparently. */ void -handle_fasteoi_irq (unsigned int irq,struct irq_desc *desc) +handle_fasteoi_irq (struct irq_desc *desc) {struct irq_chip *chip = desc->irq_data.chip;
@@ -546,7 +543,6 @@ EXPORT_SYMBOL_GPL(handle_fasteoi_irq);/** * handle_edge_irq - edge type IRQ handler -* @irq: the interrupt number * @desc: the interrupt description structure for this irq * * Interrupt occures on the falling and/or rising edge of a hardware
@@ -561,7 +557,7 @@ EXPORT_SYMBOL_GPL(handle_fasteoi_irq);* loop is left. */ void -handle_edge_irq (unsigned int irq,struct irq_desc *desc) +handle_edge_irq (struct irq_desc *desc) {raw_spin_lock (&desc->lock);
@@ -618,13 +614,12 @@ EXPORT_SYMBOL(handle_edge_irq);#ifdef CONFIG_IRQ_EDGE_EOI_HANDLER /** * handle_edge_eoi_irq - edge eoi type IRQ handler -* @irq: the interrupt number * @desc: the interrupt description structure for this irq * * Similar as the above handle_edge_irq, but using eoi and w/o the * mask/unmask logic. */ -void handle_edge_eoi_irq (unsigned int irq,struct irq_desc *desc) +void handle_edge_eoi_irq (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);
@@ -665,13 +660,12 @@ out_eoi:/** * handle_percpu_irq - Per CPU local irq handler -* @irq: the interrupt number * @desc: the interrupt description structure for this irq * * Per CPU interrupts on SMP machines without locking requirements */ void -handle_percpu_irq (unsigned int irq,struct irq_desc *desc) +handle_percpu_irq (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);
@@ -688,7 +682,6 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc)/** * handle_percpu_devid_irq - Per CPU local irq handler with per cpu dev ids -* @irq: the interrupt number * @desc: the interrupt description structure for this irq * * Per CPU interrupts on SMP machines without locking requirements. Same as
@@ -698,11 +691,12 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc)* contain the real device id for the cpu on which this handler is * called */ -void handle_percpu_devid_irq (unsigned int irq,struct irq_desc *desc) +void handle_percpu_devid_irq (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct irqaction *action = desc->action;void *dev_id =raw_cpu_ptr (action->percpu_dev_id); +unsigned int irq =irq_desc_get_irq (desc);irqreturn_t res;kstat_incr_irqs_this_cpu (desc);
kernel/irq/handle.c +2 -2
@@ -22,13 +22,13 @@/** * handle_bad_irq - handle spurious and unhandled irqs -* @irq: the interrupt number * @desc: description of the interrupt * * Handles spurious and unhandled IRQ's. It also prints a debugmessage. */ -void handle_bad_irq (unsigned int irq,struct irq_desc *desc) +void handle_bad_irq (struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);print_irq_desc (irq, desc);kstat_incr_irqs_this_cpu (desc);ack_bad_irq (irq);
kernel/irq/irqdesc.c +1 -1
@@ -347,7 +347,7 @@ int generic_handle_irq(unsigned int irq)if (!desc)return -EINVAL ; -generic_handle_irq_desc (irq, desc); +generic_handle_irq_desc (desc);return 0 ; }EXPORT_SYMBOL_GPL (generic_handle_irq);
Signature · 1 line
1.7.10.4
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
include/linux/irqdesc.h static inline struct irq_desc *irq_data_to_desc(struct irq_data *data) · line 106
Quoted 11 lines · Jiang Liu
include/linux/irqdesc.h +5
-0@@ -99,6 +99,11 @@ static inline struct irq_desc *irq_data_to_desc(struct irq_data *data) return container_of(data->common, struct irq_desc, irq_common_data); } +static inline unsigned int irq_desc_get_irq (struct irq_desc *desc) +{ +return desc->irq_data.irq; +} +
Does not apply either.
Thanks,
tglx
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Quoted 7 lines · Thomas Gleixner
Quoted 6 lines · Jiang Liu
include/linux/irqdesc.h +0
-0@@ -99,6 +99,11 @@ static inline struct irq_desc *irq_data_to_desc(struct irq_data *data) return container_of(data->common, struct irq_desc, irq_common_data); }
Quoted 7 lines
include/linux/irqdesc.h static inline struct irq_desc *irq_data_to_desc(struct irq_data *data) · line 106
Quoted 5 lines
include/linux/irqdesc.h +5
-0+static inline unsigned int irq_desc_get_irq (struct irq_desc *desc) +{ +return desc->irq_data.irq; +} +Does not apply either.
Hi Thomas,
Will check the base again.
Please do not apply patch after [14/25]. There are here to
ask for comments, there are still building issues with patch after [14/25]. Just help to comment whether it's on the right direction. If so, I will send another version for formal review. Thanks!
Gerry
Quoted 5 lines
Thanks,
tglx
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Quoted 15 lines · Jiang Liu
Quoted 7 lines · Thomas Gleixner
Quoted 6 lines · Jiang Liu
include/linux/irqdesc.h +0
-0@@ -99,6 +99,11 @@ static inline struct irq_desc *irq_data_to_desc(struct irq_data *data) return container_of(data->common, struct irq_desc, irq_common_data); }Quoted 7 lines
include/linux/irqdesc.h static inline struct irq_desc *irq_data_to_desc(struct irq_data *data) · line 106
Quoted 5 lines
include/linux/irqdesc.h +5
-0+static inline unsigned int irq_desc_get_irq (struct irq_desc *desc) +{ +return desc->irq_data.irq; +} +Does not apply either.
Quoted 6 lines
Hi Thomas,
Will check the base again.
Please do not apply patch after [14/25]. There are here to
ask for comments, there are still building issues with patch after [14/25]. Just help to comment whether it's on the right direction. If so, I will send another version for formal review.
I think you are doing that conversion wrong. You should first change all handlers which use the irq argument to:
handler(unsigned __irq, *desc)
and add the local variable
unsigned irq;
or
unsigned irq = irq_desc_get_irq(desc);
for those.
So that results in a pretty small series of patches.
Once that is done, you can remove the irq argument in one go treewide.
And you should do that with scripting aid. Coccinelle is the proper tool for this. If you have problems with cocci, you can politely ask Julia (Cc'ed) for help. She's the master of coccinelle :)
The purpose of the script is to:
1) Identify all handlers
This can be done by analyzing the arguments of
__irq_set_handler()
irq_set_handler()
irq_set_chained_handler()
irq_alloc_generic_chip()
irq_alloc_domain_generic_chips()
irq_set_chip_and_handler_name()
irq_set_chip_and_handler()
__irq_set_handler_locked()
__irq_set_chip_handler_name_locked()
__irq_set_preflow_handler()
If the argument is a function local to the file step 2 can take place.
If it's a extern function, then the script should at least print out the function names. Those are in most of the cases the generic flow handler functions.
2) Check the handlers whether they use the irq argument
For those which do:
Check whether they just use the argument instead of a local variable, i.e. the first usage is an assignment. In that case rename the argument to __irq and add a local variable
unsigned int irq;
If they use the irq argument for some computation or as argument to another function, then you need to rename the argument as well and add:
unsigned int irq = irq_get_desc_irq(desc);
So this results in a series of patches which can be merged right away. If that lot has hit Linus tree and right after -rc1, we run the script again and find and fix stuff which got added throughout the merge window. That might result in 0 to n patches.
The last step is another script which does:
1) Identify all handlers
2) Remove the irq argument
We can send that right after -rc1 so no new users can trickle in.
It's really important to do that with scripts. It seems you try to do it via compile testing. But that will fail as you CANNOT execute all possible config combinations.
Thanks,
tglx
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Quoted 63 lines · Thomas Gleixner
Quoted 15 lines · Jiang Liu
Quoted 7 lines · Thomas Gleixner
Quoted 6 lines · Jiang Liu
include/linux/irqdesc.h +0
-0@@ -99,6 +99,11 @@ static inline struct irq_desc *irq_data_to_desc(struct irq_data *data) return container_of(data->common, struct irq_desc, irq_common_data); }Quoted 7 lines
include/linux/irqdesc.h static inline struct irq_desc *irq_data_to_desc(struct irq_data *data) · line 106
Quoted 5 lines
include/linux/irqdesc.h +5
-0+static inline unsigned int irq_desc_get_irq (struct irq_desc *desc) +{ +return desc->irq_data.irq; +} +Does not apply either.
Quoted 6 lines
Hi Thomas,
Will check the base again.
Please do not apply patch after [14/25]. There are here to
ask for comments, there are still building issues with patch after [14/25]. Just help to comment whether it's on the right direction. If so, I will send another version for formal review.I think you are doing that conversion wrong. You should first change all handlers which use the irq argument to:
handler(unsigned __irq, *desc)and add the local variable
unsigned irq;or
unsigned irq = irq_desc_get_irq(desc);for those.
So that results in a pretty small series of patches.
Once that is done, you can remove the irq argument in one go treewide.
And you should do that with scripting aid. Coccinelle is the proper tool for this. If you have problems with cocci, you can politely ask Julia (Cc'ed) for help. She's the master of coccinelle :)
The purpose of the script is to:
1) Identify all handlers
This can be done by analyzing the arguments of
__irq_set_handler()
irq_set_handler()
irq_set_chained_handler()
irq_alloc_generic_chip()
irq_alloc_domain_generic_chips()
irq_set_chip_and_handler_name()
irq_set_chip_and_handler()
__irq_set_handler_locked()
__irq_set_chip_handler_name_locked()
__irq_set_preflow_handler()
Quoted 6 lines
If the argument is a function local to the file step 2 can take place.
If it's a extern function, then the script should at least print out the function names. Those are in most of the cases the generic flow handler functions.
Looks reasonable.
Quoted 8 lines
2) Check the handlers whether they use the irq argument
For those which do:
Check whether they just use the argument instead of a local variable, i.e. the first usage is an assignment. In that case rename the argument to
__irqand add a local variable
Quoted 7 lines
unsigned int irq;
If they use the irq argument for some computation or as argument to another function, then you need to rename the argument as well and add:
unsigned int irq =
irq_get_desc_irq(desc);
Scripting this may be a little complex, because the variable can be used in one way in one execution path (eg if branch) and another way (or not at all) in another. Let me know if help is needed.
julia
Quoted 22 lines
So this results in a series of patches which can be merged right away. If that lot has hit Linus tree and right after -rc1, we run the script again and find and fix stuff which got added throughout the merge window. That might result in 0 to n patches.
The last step is another script which does:
1) Identify all handlers
2) Remove the irq argument
We can send that right after -rc1 so no new users can trickle in.
It's really important to do that with scripts. It seems you try to do it via compile testing. But that will fail as you CANNOT execute all possible config combinations.
Thanks,
tglx
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Quoted 18 lines · Julia Lawall
Quoted 17 lines · Thomas Gleixner
The purpose of the script is to:
1) Identify all handlers This can be done by analyzing the arguments of __irq_set_handler() irq_set_handler() irq_set_chained_handler() irq_alloc_generic_chip() irq_alloc_domain_generic_chips() irq_set_chip_and_handler_name() irq_set_chip_and_handler() __irq_set_handler_locked() __irq_set_chip_handler_name_locked() __irq_set_preflow_handler()
Quoted 8 lines
Quoted 6 lines
If the argument is a function local to the file step 2 can take place.
If it's a extern function, then the script should at least print out the function names. Those are in most of the cases the generic flow handler functions.
Looks reasonable.
Good.
Quoted 14 lines
Quoted 14 lines
2) Check the handlers whether they use the irq argument
For those which do:
Check whether they just use the argument instead of a local variable, i.e. the first usage is an assignment. In that case rename the argument to
__irqand add a local variableunsigned int irq;
If they use the irq argument for some computation or as argument to another function, then you need to rename the argument as well and add:
Quoted 5 lines
Quoted 1 line
unsigned int irq = irq_get_desc_irq(desc);Scripting this may be a little complex, because the variable can be used in one way in one execution path (eg if branch) and another way (or not at all) in another. Let me know if help is needed.
I feared that, but at least identifying all functions, where the irq argument is used inside the function itself is really key for such a massive rework.
Thanks for responding so quick!
tglx
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Quoted 46 lines · Thomas Gleixner
Quoted 18 lines · Julia Lawall
Quoted 17 lines · Thomas Gleixner
The purpose of the script is to:
1) Identify all handlers This can be done by analyzing the arguments of __irq_set_handler() irq_set_handler() irq_set_chained_handler() irq_alloc_generic_chip() irq_alloc_domain_generic_chips() irq_set_chip_and_handler_name() irq_set_chip_and_handler() __irq_set_handler_locked() __irq_set_chip_handler_name_locked() __irq_set_preflow_handler()Quoted 8 lines
Quoted 6 lines
If the argument is a function local to the file step 2 can take place.
If it's a extern function, then the script should at least print out the function names. Those are in most of the cases the generic flow handler functions.
Looks reasonable.
Good.
Quoted 16 lines
Quoted 15 lines
2) Check the handlers whether they use the irq argument
For those which do:
Check whether they just use the argument instead of a local variable, i.e. the first usage is an assignment. In that case rename the argument to
__irqand add a local variableunsigned int irq;
If they use the irq argument for some computation or as argument to another function, then you need to rename the argument as well and add:
unsigned int irq =
irq_get_desc_irq(desc);
Quoted 7 lines
Quoted 3 lines
Scripting this may be a little complex, because the variable can be used in one way in one execution path (eg if branch) and another way (or not at all) in another. Let me know if help is needed.
I feared that, but at least identifying all functions, where the irq argument is used inside the function itself is really key for such a massive rework.
It's not impossible, but I may need to think a bit how best to do it.
julia
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Quoted 11 lines · Julia Lawall
Quoted 8 lines · Thomas Gleixner
Quoted 3 lines · Julia Lawall
Scripting this may be a little complex, because the variable can be used in one way in one execution path (eg if branch) and another way (or not at all) in another. Let me know if help is needed.
I feared that, but at least identifying all functions, where the irq argument is used inside the function itself is really key for such a massive rework.
It's not impossible, but I may need to think a bit how best to do it.
I pretty much expected that you would say that :)
But seriously, the first important thing is to find all functions and to check whether they use irq internaly. Jiang has done that 'manually' or such, so the number of function which need an actual change are not that big.
But I certainly don't want to hold you off thinking about it. Such stuff is not a unique problem :)
tglx
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Quoted 15 lines · Thomas Gleixner
Quoted 11 lines · Julia Lawall
Quoted 8 lines · Thomas Gleixner
Quoted 3 lines · Julia Lawall
Scripting this may be a little complex, because the variable can be used in one way in one execution path (eg if branch) and another way (or not at all) in another. Let me know if help is needed.
I feared that, but at least identifying all functions, where the irq argument is used inside the function itself is really key for such a massive rework.
It's not impossible, but I may need to think a bit how best to do it.
I pretty much expected that you would say that :)
Quoted 7 lines
But seriously, the first important thing is to find all functions and to check whether they use irq internaly. Jiang has done that 'manually' or such, so the number of function which need an actual change are not that big.
But I certainly don't want to hold you off thinking about it. Such stuff is not a unique problem :)
What is the status of this? I am close to having a semantic patch that works. The current version touches 133 files, but I haven't checked all of them. This includes both the local functions and the generic ones, but not the cases where the name of the handler function is a local variable or arbitrary expression. This occurs in around 30 files.
julia
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Quoted 5 lines · Julia Lawall
What is the status of this? I am close to having a semantic patch that works. The current version touches 133 files, but I haven't checked all of them. This includes both the local functions and the generic ones, but not the cases where the name of the handler function is a local variable or arbitrary expression. This occurs in around 30 files.
Jiang sent out a new patch series, but I'm really interested in doing a fully automated check. If conversion is possible for some of them, fine, but the checking part to find all the places where this needs to be applied is the most important to me.
If you want, just send me that script and I'll give it a test ride.
Thanks,
tglx
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Quoted 7 lines · Thomas Gleixner
Quoted 5 lines · Julia Lawall
What is the status of this? I am close to having a semantic patch that works. The current version touches 133 files, but I haven't checked all of them. This includes both the local functions and the generic ones, but not the cases where the name of the handler function is a local variable or arbitrary expression. This occurs in around 30 files.
Quoted 6 lines
Jiang sent out a new patch series, but I'm really interested in doing a fully automated check. If conversion is possible for some of them, fine, but the checking part to find all the places where this needs to be applied is the most important to me.
If you want, just send me that script and I'll give it a test ride.
The results are attached. The semantic patch is below. This should be run with the argument --in-place. You need to have ocaml installed.
julia
virtual after_start
@initialize:ocaml@
@@
let tbl = Hashtbl.create(100)
let ltbl = Hashtbl.create(100)
let add_if_not_present f p =
try let _ = Hashtbl.find tbl f in ()
with Not_found ->
Hashtbl.add tbl f p;
let it = new iteration() in
it#add_virtual_rule After_start;
it#add_virtual_identifier Hf f;
it#register()
let local_add_if_not_present f file =
try let _ = Hashtbl.find ltbl (f,file) in ()
with Not_found ->
Hashtbl.add ltbl (f,file) ();
let it = new iteration() in
it#set_files [file];
it#add_virtual_rule After_start;
it#add_virtual_identifier Hf f;
it#register()
// ------------------------------------------------------------------------ // Getting started
@h depends on !after_start@
identifier ih != NULL;
local idexpression lih;
expression eh;
expression e1,e2,e3,e4,e5,e6,e7;
position p;
@@
(
__irq_set_handler@p(e1,\(lih\|ih\|eh\),e2,e3)
|
irq_set_handler@p(e1,\(lih\|ih\|eh\))
|
irq_set_chained_handler@p(e1,\(lih\|ih\|eh\))
|
irq_alloc_generic_chip@p(e1,e2,e3,\(lih\|ih\|eh\))
| irq_alloc_domain_generic_chips@p(e1,e2,e3,e4,\(lih\|ih\|eh\),e5,e6,e7) |
irq_set_chip_and_handler_name@p(e1,e2,\(lih\|ih\|eh\),e3)
|
irq_set_chip_and_handler@p(e1,e2,\(lih\|ih\|eh\))
|
__irq_set_handler_locked@p(e1,\(lih\|ih\|eh\))
| __irq_set_chip_handler_name_locked@p(e1,e2,\(lih\|ih\|eh\),e3) |
__irq_set_preflow_handler@p(e1,\(lih\|ih\|eh\))
)
@localfn@
identifier h.ih;
@@
ih(...) { ... }
@script:ocaml depends on !localfn@
p << h.p;
handler << h.ih;
@@
add_if_not_present handler p
@script:ocaml depends on localfn@
p << h.p;
handler << h.ih;
@@
local_add_if_not_present handler (List.hd p).file
@script:ocaml@
p << h.p;
handler << h.lih;
@@
Printf.eprintf "Local variable: %s:%d %s\n"
((List.hd p).file) ((List.hd p).line) handler
@script:ocaml@
p << h.p;
handler << h.eh;
@@
Printf.eprintf "Arbitrary expression: %s:%d %s\n"
((List.hd p).file) ((List.hd p).line) handler
// ------------------------------------------------------------------------ // Adjusting functions
@@
identifier virtual.hf,irq;
fresh identifier firq = "__" ## irq;
type T;
@@
hf(T
- irq
+ firq
,...) {
... when != irq
when strict
}
@s@
identifier virtual.hf,irq;
position p1;
type T;
@@
hf(T irq,...) {
<...
(irq@p1 = <+...irq...+>)
...>
}
@s1@
identifier virtual.hf,irq;
position p1;
expression e;
statement S;
type T;
@@
hf(T irq,...) {
<...
for(...; ...; <+...irq@p1 = e...+>) S
...>
}
// first parameter is assigned at least once
@r exists@
identifier virtual.hf,irq;
expression e;
type T;
position p,p1 != {s.p1,s1.p1};
@@
hf(T@p irq,...) {
... when != irq
when strict
irq@p1 = e
... when any
}
// no uses of the first parameter before the assignment @@
identifier virtual.hf,irq;
expression e;
type T;
fresh identifier firq = "__" ## irq;
position r.p,p1 != {s.p1,s1.p1};
@@
hf(T@p
- irq
+ firq
,...) {
... when != irq
when strict
? irq@p1 = e
... when any
}
// first parameter is used somewhere
@rr exists@
identifier virtual.hf,irq;
type T;
position p;
@@
hf(T@p irq,...) {
...
irq
... when any
}
@@
identifier virtual.hf,irq,desc;
fresh identifier firq = "__" ## irq;
type T,T1;
position rr.p;
@@
hf(T@p
- irq
+ firq
,T1 desc) {
+ unsigned int irq = irq_get_desc_irq(desc);
... when any
}
arch/arm/common/locomo.c +2 -1
@@ -138,8 +138,9 @@ static struct locomo_dev_info locomo_devices[] = { }, }; -static void locomo_handler (unsigned int irq,struct irq_desc *desc) +static void locomo_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct locomo *lchip =irq_get_chip_data (irq);int req, i;
arch/arm/common/sa1111.c +2 -1
@@ -197,8 +197,9 @@ static struct sa1111_dev_info sa1111_devices[] = {* will call us again if there are more interrupts to process. */ static void -sa1111_irq_handler (unsigned int irq,struct irq_desc *desc) +sa1111_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);unsigned int stat0, stat1, i;struct sa1111 *sachip =irq_get_handler_data (irq);void __iomem *mapbase = sachip->base +SA1111_INTC ;
arch/arm/mach-dove/irq.c +2 -1
@@ -69,8 +69,9 @@ static struct irq_chip pmu_irq_chip = { .irq_ack = pmu_irq_ack, }; -static void pmu_irq_handler (unsigned int irq,struct irq_desc *desc) +static void pmu_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);unsigned long cause =readl (PMU_INTERRUPT_CAUSE ); cause &=readl (PMU_INTERRUPT_MASK );
arch/arm/mach-footbridge/isa-irq.c +1 -1
@@ -88,7 +88,7 @@ static struct irq_chip isa_hi_chip = { };static void -isa_irq_handler (unsigned int irq,struct irq_desc *desc) +isa_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned int isa_irq = *(unsigned char *)PCIIACK_BASE ;
arch/arm/mach-gemini/gpio.c +1 -1
@@ -126,7 +126,7 @@ static int gpio_set_irq_type(struct irq_data *d, unsigned int type)return 0 ; } -static void gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void gpio_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned int port = (unsigned int )irq_desc_get_handler_data (desc);unsigned int gpio_irq_no, irq_stat;
arch/arm/mach-imx/3ds_debugboard.c +1 -1
@@ -85,7 +85,7 @@ static struct platform_device smsc_lan9217_device = { .resource = smsc911x_resources, }; -static void mxc_expio_irq_handler (u32 irq,struct irq_desc *desc) +static void mxc_expio_irq_handler (u32 __irq,struct irq_desc *desc) {u32 imr_val;u32 int_valid;
arch/arm/mach-imx/mach-mx31ads.c +1 -1
@@ -154,7 +154,7 @@ static inline void mxc_init_imx_uart(void)imx31_add_imx_uart0 (&uart_pdata); } -static void mx31ads_expio_irq_handler (u32 irq,struct irq_desc *desc) +static void mx31ads_expio_irq_handler (u32 __irq,struct irq_desc *desc) {u32 imr_val;u32 int_valid;
arch/arm/mach-iop13xx/msi.c +1 -1
@@ -91,7 +91,7 @@ static void (*write_imipr[])(u32) = { write_imipr_3, }; -static void iop13xx_msi_handler (unsigned int irq,struct irq_desc *desc) +static void iop13xx_msi_handler (unsigned int __irq,struct irq_desc *desc) {int i, j;unsigned long status;
arch/arm/mach-lpc32xx/irq.c +2 -2
@@ -370,7 +370,7 @@ static struct irq_chip lpc32xx_irq_chip = { .irq_set_wake = lpc32xx_irq_wake }; -static void lpc32xx_sic1_handler (unsigned int irq,struct irq_desc *desc) +static void lpc32xx_sic1_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long ints =__raw_readl (LPC32XX_INTC_STAT (LPC32XX_SIC1_BASE ));
@@ -383,7 +383,7 @@ static void lpc32xx_sic1_handler(unsigned int irq, struct irq_desc *desc) } } -static void lpc32xx_sic2_handler (unsigned int irq,struct irq_desc *desc) +static void lpc32xx_sic2_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long ints =__raw_readl (LPC32XX_INTC_STAT (LPC32XX_SIC2_BASE ));
arch/arm/mach-netx/generic.c +1 -1
@@ -70,7 +70,7 @@ static struct platform_device *devices[] __initdata = {#endif static void -netx_hif_demux_handler (unsigned int irq_unused,struct irq_desc *desc) +netx_hif_demux_handler (unsigned int __irq_unused,struct irq_desc *desc) {unsigned int irq =NETX_IRQ_HIF_CHAINED (0 );unsigned int stat;
arch/arm/mach-omap1/fpga.c +2 -1
@@ -87,7 +87,8 @@ static void fpga_mask_ack_irq(struct irq_data *d)fpga_ack_irq (d); } -static void innovator_fpga_IRQ_demux (unsigned int irq,struct irq_desc *desc) +static void innovator_fpga_IRQ_demux (unsigned int __irq, +struct irq_desc *desc) {u32 stat;int fpga_irq;
arch/arm/mach-omap2/prm_common.c +1 -1
@@ -102,7 +102,7 @@ static void omap_prcm_events_filter_priority(unsigned long *events,* dispatched accordingly. Clearing of the wakeup events should be * done by the SoC specific individual handlers. */ -static void omap_prcm_irq_handler (unsigned int irq,struct irq_desc *desc) +static void omap_prcm_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending[OMAP_PRCM_MAX_NR_PENDING_REG ];unsigned long priority_pending[OMAP_PRCM_MAX_NR_PENDING_REG ];
arch/arm/mach-pxa/balloon3.c +1 -1
@@ -496,7 +496,7 @@ static struct irq_chip balloon3_irq_chip = { .irq_unmask = balloon3_unmask_irq, }; -static void balloon3_irq_handler (unsigned int irq,struct irq_desc *desc) +static void balloon3_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending =__raw_readl (BALLOON3_INT_CONTROL_REG ) & balloon3_irq_enabled;
arch/arm/mach-pxa/cm-x2xx-pci.c +2 -1
@@ -29,8 +29,9 @@void __iomem *it8152_base_address;static int cmx2xx_it8152_irq_gpio; -static void cmx2xx_it8152_irq_demux (unsigned int irq,struct irq_desc *desc) +static void cmx2xx_it8152_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);/* clear our parent irq */ desc->irq_data.chip->irq_ack (&desc->irq_data);
arch/arm/mach-pxa/lpd270.c +1 -1
@@ -120,7 +120,7 @@ static struct irq_chip lpd270_irq_chip = { .irq_unmask = lpd270_unmask_irq, }; -static void lpd270_irq_handler (unsigned int irq,struct irq_desc *desc) +static void lpd270_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending;
arch/arm/mach-pxa/pcm990-baseboard.c +1 -1
@@ -284,7 +284,7 @@ static struct irq_chip pcm990_irq_chip = { .irq_unmask = pcm990_unmask_irq, }; -static void pcm990_irq_handler (unsigned int irq,struct irq_desc *desc) +static void pcm990_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending;
arch/arm/mach-pxa/viper.c +1 -1
@@ -276,7 +276,7 @@ static inline unsigned long viper_irq_pending(void) viper_irq_enabled_mask; } -static void viper_irq_handler (unsigned int irq,struct irq_desc *desc) +static void viper_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending;
arch/arm/mach-pxa/zeus.c +1 -1
@@ -105,7 +105,7 @@ static inline unsigned long zeus_irq_pending(void)return __raw_readw (ZEUS_CPLD_ISA_IRQ ) & zeus_irq_enabled_mask; } -static void zeus_irq_handler (unsigned int irq,struct irq_desc *desc) +static void zeus_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending;
arch/arm/mach-rpc/ecard.c +1 -1
@@ -552,7 +552,7 @@ static void ecard_check_lockup(struct irq_desc *desc) }static void -ecard_irq_handler (unsigned int irq,struct irq_desc *desc) +ecard_irq_handler (unsigned int __irq,struct irq_desc *desc) {ecard_t *ec;int called =0 ;
arch/arm/mach-s3c24xx/bast-irq.c +1 -1
@@ -101,7 +101,7 @@ static struct irq_chip bast_pc104_chip = { };static void -bast_irq_pc104_demux (unsigned int irq, +bast_irq_pc104_demux (unsigned int __irq,struct irq_desc *desc) {unsigned int stat;
arch/arm/mach-s3c64xx/common.c +4 -4
@@ -389,22 +389,22 @@ static inline void s3c_irq_demux_eint(unsigned int start, unsigned int end) } } -static void s3c_irq_demux_eint0_3 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint0_3 (unsigned int __irq,struct irq_desc *desc) {s3c_irq_demux_eint (0 ,3 ); } -static void s3c_irq_demux_eint4_11 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint4_11 (unsigned int __irq,struct irq_desc *desc) {s3c_irq_demux_eint (4 ,11 ); } -static void s3c_irq_demux_eint12_19 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint12_19 (unsigned int __irq,struct irq_desc *desc) {s3c_irq_demux_eint (12 ,19 ); } -static void s3c_irq_demux_eint20_27 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint20_27 (unsigned int __irq,struct irq_desc *desc) {s3c_irq_demux_eint (20 ,27 ); }
arch/arm/mach-sa1100/neponset.c +1 -1
@@ -166,7 +166,7 @@ static struct sa1100_port_fns neponset_port_fns = {* ensure that the IRQ signal is deasserted before returning. This * is rather unfortunate. */ -static void neponset_irq_handler (unsigned int irq,struct irq_desc *desc) +static void neponset_irq_handler (unsigned int __irq,struct irq_desc *desc) {struct neponset_drvdata *d =irq_desc_get_handler_data (desc);unsigned int irr;
arch/arm/plat-orion/gpio.c +2 -1
@@ -407,8 +407,9 @@ static int gpio_irq_set_type(struct irq_data *d, u32 type)return 0 ; } -static void gpio_irq_handler (unsigned irq,struct irq_desc *desc) +static void gpio_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct orion_gpio_chip *ochip =irq_get_handler_data (irq);u32 cause, type;int i;
arch/avr32/mach-at32ap/extint.c +1 -1
@@ -144,7 +144,7 @@ static struct irq_chip eic_chip = { .irq_set_type = eic_set_irq_type, }; -static void demux_eic_irq (unsigned int irq,struct irq_desc *desc) +static void demux_eic_irq (unsigned int __irq,struct irq_desc *desc) {struct eic *eic =irq_desc_get_handler_data (desc);unsigned long status, pending;
arch/avr32/mach-at32ap/pio.c +2 -1
@@ -281,8 +281,9 @@ static struct irq_chip gpio_irqchip = { .irq_set_type = gpio_irq_type, }; -static void gpio_irq_handler (unsigned irq,struct irq_desc *desc) +static void gpio_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct pio_device *pio =irq_desc_get_chip_data (desc);unsigned gpio_irq;
arch/blackfin/mach-bf537/ints-priority.c +3 -2
@@ -89,7 +89,7 @@ static struct irq_chip bf537_generic_error_irqchip = { .irq_unmask = bf537_generic_error_unmask_irq, }; -static void bf537_demux_error_irq (unsigned int int_err_irq, +static void bf537_demux_error_irq (unsigned int __int_err_irq,struct irq_desc *inta_desc) {int irq =0 ;
@@ -182,9 +182,10 @@ static struct irq_chip bf537_mac_rx_irqchip = { .irq_unmask = bf537_mac_rx_unmask_irq, }; -static void bf537_demux_mac_rx_irq (unsigned int int_irq, +static void bf537_demux_mac_rx_irq (unsigned int __int_irq,struct irq_desc *desc) { +unsigned int int_irq =irq_get_desc_irq (desc);if (bfin_read_DMA1_IRQ_STATUS () & (DMA_DONE |DMA_ERR ))bfin_handle_irq (IRQ_MAC_RX );else
arch/blackfin/mach-common/ints-priority.c +4 -3
@@ -655,7 +655,7 @@ static struct irq_chip bfin_mac_status_irqchip = { .irq_set_wake = bfin_mac_status_set_wake, }; -void bfin_demux_mac_status_irq (unsigned int int_err_irq, +void bfin_demux_mac_status_irq (unsigned int ____int_err_irq,struct irq_desc *inta_desc) {int i, irq =0 ;
@@ -824,9 +824,10 @@ static void bfin_demux_gpio_block(unsigned int irq) } } -void bfin_demux_gpio_irq (unsigned int inta_irq, -struct irq_desc *desc) +void bfin_demux_gpio_irq (unsigned int __inta_irq, +struct irq_desc *desc) { +unsigned int inta_irq =irq_get_desc_irq (desc);unsigned int irq;switch (inta_irq) {
arch/c6x/platforms/megamod-pic.c +1 -1
@@ -93,7 +93,7 @@ static struct irq_chip megamod_chip = { .irq_unmask = unmask_megamod, }; -static void megamod_irq_cascade (unsigned int irq,struct irq_desc *desc) +static void megamod_irq_cascade (unsigned int __irq,struct irq_desc *desc) {struct megamod_cascade_data *cascade;struct megamod_pic *pic;
arch/m68k/amiga/amiints.c +4 -4
@@ -46,7 +46,7 @@ static struct irq_chip amiga_irq_chip = {* The builtin Amiga hardware interrupt handlers. */ -static void ami_int1 (unsigned int irq,struct irq_desc *desc) +static void ami_int1 (unsigned int __irq,struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
@@ -69,7 +69,7 @@ static void ami_int1(unsigned int irq, struct irq_desc *desc) } } -static void ami_int3 (unsigned int irq,struct irq_desc *desc) +static void ami_int3 (unsigned int __irq,struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
@@ -92,7 +92,7 @@ static void ami_int3(unsigned int irq, struct irq_desc *desc) } } -static void ami_int4 (unsigned int irq,struct irq_desc *desc) +static void ami_int4 (unsigned int __irq,struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
@@ -121,7 +121,7 @@ static void ami_int4(unsigned int irq, struct irq_desc *desc) } } -static void ami_int5 (unsigned int irq,struct irq_desc *desc) +static void ami_int5 (unsigned int __irq,struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
arch/m68k/coldfire/intc-5272.c +2 -1
@@ -143,8 +143,9 @@ static int intc_irq_set_type(struct irq_data *d, unsigned int type)* We need to be careful with the masking/acking due to the side effects * of masking an interrupt. */ -static void intc_external_irq (unsigned int irq,struct irq_desc *desc) +static void intc_external_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);irq_desc_get_chip (desc)->irq_ack (&desc->irq_data);handle_simple_irq (irq, desc); }
arch/m68k/mac/baboon.c +1 -1
@@ -45,7 +45,7 @@ void __init baboon_init(void)* Baboon interrupt handler. This works a lot like a VIA. */ -static void baboon_irq (unsigned int irq,struct irq_desc *desc) +static void baboon_irq (unsigned int __irq,struct irq_desc *desc) {int irq_bit, irq_num;unsigned char events;
arch/m68k/mac/oss.c +3 -2
@@ -63,8 +63,9 @@ void __init oss_nubus_init(void)* Handle miscellaneous OSS interrupts. */ -static void oss_irq (unsigned int irq,struct irq_desc *desc) +static void oss_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);int events = oss->irq_pending & (OSS_IP_IOPSCC |OSS_IP_SCSI |OSS_IP_IOPISM );
@@ -97,7 +98,7 @@ static void oss_irq(unsigned int irq, struct irq_desc *desc)* Unlike the VIA/RBV this is on its own autovector interrupt level. */ -static void oss_nubus_irq (unsigned int irq,struct irq_desc *desc) +static void oss_nubus_irq (unsigned int __irq,struct irq_desc *desc) {int events, irq_bit, i;
arch/m68k/mac/psc.c +2 -1
@@ -113,8 +113,9 @@ void __init psc_init(void)* PSC interrupt handler. It's a lot like the VIA interrupt handler. */ -static void psc_irq (unsigned int irq,struct irq_desc *desc) +static void psc_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);unsigned int offset = (unsigned int )irq_desc_get_handler_data (desc);int pIFR = pIFRbase + offset;int pIER = pIERbase + offset;
arch/m68k/mac/via.c +3 -3
@@ -446,7 +446,7 @@ void via_nubus_irq_shutdown(int irq)* via6522.c :-), disable/pending masks added. */ -void via1_irq (unsigned int irq,struct irq_desc *desc) +void via1_irq (unsigned int ____irq,struct irq_desc *desc) {int irq_num;unsigned char irq_bit, events;
@@ -467,7 +467,7 @@ void via1_irq(unsigned int irq, struct irq_desc *desc) }while (events >= irq_bit); } -static void via2_irq (unsigned int irq,struct irq_desc *desc) +static void via2_irq (unsigned int __irq,struct irq_desc *desc) {int irq_num;unsigned char irq_bit, events;
@@ -493,7 +493,7 @@ static void via2_irq(unsigned int irq, struct irq_desc *desc)* VIA2 dispatcher as a fast interrupt handler. */ -void via_nubus_irq (unsigned int irq,struct irq_desc *desc) +void via_nubus_irq (unsigned int __irq,struct irq_desc *desc) {int slot_irq;unsigned char slot_bit, events;
arch/mips/alchemy/common/irq.c +1 -1
@@ -865,7 +865,7 @@ DISP(ic0r1, AU1000_INTC0_INT_BASE, AU1000_IC0_PHYS_ADDR + IC_REQ1INT) DISP(ic1r0, AU1000_INTC1_INT_BASE, AU1000_IC1_PHYS_ADDR + IC_REQ0INT) DISP(ic1r1, AU1000_INTC1_INT_BASE, AU1000_IC1_PHYS_ADDR + IC_REQ1INT) -static void alchemy_gpic_dispatch (unsigned int irq,struct irq_desc *d) +static void alchemy_gpic_dispatch (unsigned int __irq,struct irq_desc *d) {int i =__raw_readl (AU1300_GPIC_ADDR +AU1300_GPIC_PRIENC );generic_handle_irq (ALCHEMY_GPIC_INT_BASE + i);
arch/mips/alchemy/devboards/bcsr.c +2 -1
@@ -85,8 +85,9 @@ EXPORT_SYMBOL_GPL(bcsr_mod);/* * DB1200/PB1200 CPLD IRQ muxer */ -static void bcsr_csc_handler (unsigned int irq,struct irq_desc *d) +static void bcsr_csc_handler (unsigned int __irq,struct irq_desc *d) { +unsigned int irq =irq_get_desc_irq (d);unsigned short bisr =__raw_readw (bcsr_virt +BCSR_REG_INTSTAT );disable_irq_nosync (irq);
arch/mips/ath25/ar2315.c +1 -1
@@ -69,7 +69,7 @@ static struct irqaction ar2315_ahb_err_interrupt = { .name = "ar2315-ahb-error", }; -static void ar2315_misc_irq_handler (unsigned irq,struct irq_desc *desc) +static void ar2315_misc_irq_handler (unsigned __irq,struct irq_desc *desc) {u32 pending =ar2315_rst_reg_read (AR2315_ISR ) &ar2315_rst_reg_read (AR2315_IMR );
arch/mips/ath25/ar5312.c +1 -1
@@ -73,7 +73,7 @@ static struct irqaction ar5312_ahb_err_interrupt = { .name = "ar5312-ahb-error", }; -static void ar5312_misc_irq_handler (unsigned irq,struct irq_desc *desc) +static void ar5312_misc_irq_handler (unsigned __irq,struct irq_desc *desc) {u32 pending =ar5312_rst_reg_read (AR5312_ISR ) &ar5312_rst_reg_read (AR5312_IMR );
arch/mips/ath79/irq.c +9 -4
@@ -27,7 +27,7 @@#include "common.h" #include "machtypes.h" -static void ath79_misc_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ath79_misc_irq_handler (unsigned int __irq,struct irq_desc *desc) {void __iomem *base = ath79_reset_base;u32 pending;
@@ -120,8 +120,9 @@ static void __init ath79_misc_irq_init(void)irq_set_chained_handler (ATH79_CPU_IRQ (6 ), ath79_misc_irq_handler); } -static void ar934x_ip2_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void ar934x_ip2_irq_dispatch (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);u32 status;disable_irq_nosync (irq);
@@ -153,8 +154,10 @@ static void ar934x_ip2_irq_init(void)irq_set_chained_handler (ATH79_CPU_IRQ (2 ), ar934x_ip2_irq_dispatch); } -static void qca955x_ip2_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void qca955x_ip2_irq_dispatch (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);u32 status;disable_irq_nosync (irq);
@@ -181,8 +184,10 @@ enable:enable_irq (irq); } -static void qca955x_ip3_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void qca955x_ip3_irq_dispatch (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);u32 status;disable_irq_nosync (irq);
arch/mips/jz4740/gpio.c +2 -1
@@ -296,7 +296,8 @@ static void jz_gpio_check_trigger_both(struct jz_gpio_chip *chip, unsigned int iwritel (mask, reg); } -static void jz_gpio_irq_demux_handler (unsigned int irq,struct irq_desc *desc) +static void jz_gpio_irq_demux_handler (unsigned int __irq, +struct irq_desc *desc) {uint32_t flag;unsigned int gpio_irq;
arch/mips/kernel/i8259.c +2 -1
@@ -353,8 +353,9 @@ void __init init_i8259_irqs(void)__init_i8259_irqs (NULL ); } -static void i8259_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void i8259_irq_dispatch (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_domain *domain =irq_get_handler_data (irq);int hwirq =i8259_irq ();
arch/mips/netlogic/common/smp.c +4 -2
@@ -82,8 +82,9 @@ void nlm_send_ipi_mask(const struct cpumask *mask, unsigned int action) }/* IRQ_IPI_SMP_FUNCTION Handler */ -void nlm_smp_function_ipi_handler (unsigned int irq,struct irq_desc *desc) +void nlm_smp_function_ipi_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);clear_c0_eimr (irq);ack_c0_eirr (irq);smp_call_function_interrupt ();
@@ -91,8 +92,9 @@ void nlm_smp_function_ipi_handler(unsigned int irq, struct irq_desc *desc) }/* IRQ_IPI_SMP_RESCHEDULE handler */ -void nlm_smp_resched_ipi_handler (unsigned int irq,struct irq_desc *desc) +void nlm_smp_resched_ipi_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);clear_c0_eimr (irq);ack_c0_eirr (irq);scheduler_ipi ();
arch/mips/pci/pci-ar2315.c +1 -1
@@ -318,7 +318,7 @@ static int ar2315_pci_host_setup(struct ar2315_pci_ctrl *apc)return 0 ; } -static void ar2315_pci_irq_handler (unsigned irq,struct irq_desc *desc) +static void ar2315_pci_irq_handler (unsigned __irq,struct irq_desc *desc) {struct ar2315_pci_ctrl *apc =irq_desc_get_handler_data (desc); u32 pending = ar2315_pci_reg_read(apc, AR2315_PCI_ISR) &
arch/mips/pci/pci-ar71xx.c +1 -1
@@ -226,7 +226,7 @@ static struct pci_ops ar71xx_pci_ops = { .write = ar71xx_pci_write_config, }; -static void ar71xx_pci_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ar71xx_pci_irq_handler (unsigned int __irq,struct irq_desc *desc) {struct ar71xx_pci_controller *apc;void __iomem *base = ath79_reset_base;
arch/mips/pci/pci-ar724x.c +1 -1
@@ -225,7 +225,7 @@ static struct pci_ops ar724x_pci_ops = { .write = ar724x_pci_write, }; -static void ar724x_pci_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ar724x_pci_irq_handler (unsigned int __irq,struct irq_desc *desc) {struct ar724x_pci_controller *apc;void __iomem *base;
arch/mips/pci/pci-rt3883.c +1 -1
@@ -129,7 +129,7 @@ static void rt3883_pci_write_cfg32(struct rt3883_pci_controller *rpc,rt3883_pci_w32 (rpc, val,RT3883_PCI_REG_CFGDATA ); } -static void rt3883_pci_irq_handler (unsigned int irq,struct irq_desc *desc) +static void rt3883_pci_irq_handler (unsigned int __irq,struct irq_desc *desc) {struct rt3883_pci_controller *rpc;u32 pending;
arch/mips/ralink/irq.c +1 -1
@@ -95,7 +95,7 @@ unsigned int get_c0_compare_int(void)return CP0_LEGACY_COMPARE_IRQ ; } -static void ralink_intc_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ralink_intc_irq_handler (unsigned int __irq,struct irq_desc *desc) {u32 pending =rt_intc_r32 (INTC_REG_STATUS0 );
arch/powerpc/platforms/512x/mpc5121_ads_cpld.c +1 -1
@@ -105,7 +105,7 @@ cpld_pic_get_irq(int offset, u8 ignore, u8 __iomem *statusp, }static void -cpld_pic_cascade (unsigned int irq,struct irq_desc *desc) +cpld_pic_cascade (unsigned int __irq,struct irq_desc *desc) { irq =cpld_pic_get_irq (0 ,PCI_IGNORE , &cpld_regs->pci_status, &cpld_regs->pci_mask);
arch/powerpc/platforms/52xx/media5200.c +1 -1
@@ -80,7 +80,7 @@ static struct irq_chip media5200_irq_chip = { .irq_mask_ack = media5200_irq_mask, }; -void media5200_irq_cascade (unsigned int virq,struct irq_desc *desc) +void media5200_irq_cascade (unsigned int __virq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);int sub_virq, val;
arch/powerpc/platforms/52xx/mpc52xx_gpt.c +1 -1
@@ -191,7 +191,7 @@ static struct irq_chip mpc52xx_gpt_irq_chip = { .irq_set_type = mpc52xx_gpt_irq_set_type, }; -void mpc52xx_gpt_irq_cascade (unsigned int virq,struct irq_desc *desc) +void mpc52xx_gpt_irq_cascade (unsigned int __virq,struct irq_desc *desc) {struct mpc52xx_gpt_priv *gpt =irq_desc_get_handler_data (desc);int sub_virq;
arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +1 -1
@@ -78,7 +78,7 @@ static struct irq_chip pq2ads_pci_ic = { .irq_disable = pq2ads_pci_mask_irq }; -static void pq2ads_pci_irq_demux (unsigned int irq,struct irq_desc *desc) +static void pq2ads_pci_irq_demux (unsigned int __irq,struct irq_desc *desc) {struct pq2ads_pci_pic *priv =irq_desc_get_handler_data (desc);u32 stat, mask, pend;
arch/powerpc/platforms/85xx/common.c +1 -1
@@ -49,7 +49,7 @@ int __init mpc85xx_common_publish_devices(void)return of_platform_bus_probe (NULL , mpc85xx_common_ids,NULL ); }#ifdef CONFIG_CPM2 -static void cpm2_cascade (unsigned int irq,struct irq_desc *desc) +static void cpm2_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);int cascade_irq;
arch/powerpc/platforms/85xx/mpc85xx_cds.c +2 -1
@@ -192,9 +192,10 @@ void mpc85xx_cds_fixup_bus(struct pci_bus *bus) }#ifdef CONFIG_PPC_I8259 -static void mpc85xx_8259_cascade_handler (unsigned int irq, +static void mpc85xx_8259_cascade_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);unsigned int cascade_irq =i8259_irq ();if (cascade_irq !=NO_IRQ )
arch/powerpc/platforms/85xx/mpc85xx_ds.c +1 -1
@@ -46,7 +46,7 @@#endif #ifdef CONFIG_PPC_I8259 -static void mpc85xx_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void mpc85xx_8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
arch/powerpc/platforms/85xx/socrates_fpga_pic.c +2 -1
@@ -91,8 +91,9 @@ static inline unsigned int socrates_fpga_pic_get_irq(unsigned int irq) (irq_hw_number_t)i); } -void socrates_fpga_pic_cascade (unsigned int irq,struct irq_desc *desc) +void socrates_fpga_pic_cascade (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq;
arch/powerpc/platforms/86xx/pic.c +1 -1
@@ -17,7 +17,7 @@#include <asm/i8259.h> #ifdef CONFIG_PPC_I8259 -static void mpc86xx_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void mpc86xx_8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
arch/powerpc/platforms/8xx/m8xx_setup.c +1 -1
@@ -214,7 +214,7 @@ void mpc8xx_restart(char *cmd)panic ("Restart failed\n" ); } -static void cpm_cascade (unsigned int irq,struct irq_desc *desc) +static void cpm_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);int cascade_irq =cpm_get_irq ();
arch/powerpc/platforms/cell/axon_msi.c +1 -1
@@ -93,7 +93,7 @@ static void msic_dcr_write(struct axon_msic *msic, unsigned int dcr_n, u32 val)dcr_write (msic->dcr_host, dcr_n, val); } -static void axon_msi_cascade (unsigned int irq,struct irq_desc *desc) +static void axon_msi_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct axon_msic *msic =irq_desc_get_handler_data (desc);
arch/powerpc/platforms/cell/interrupt.c +2 -1
@@ -99,8 +99,9 @@ static void iic_ioexc_eoi(struct irq_data *d) { } -static void iic_ioexc_cascade (unsigned int irq,struct irq_desc *desc) +static void iic_ioexc_cascade (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_chip *chip =irq_desc_get_chip (desc);struct cbe_iic_regs __iomem *node_iic = (void __iomem *)irq_desc_get_handler_data (desc);
arch/powerpc/platforms/cell/spider-pic.c +1 -1
@@ -199,7 +199,7 @@ static const struct irq_domain_ops spider_host_ops = { .xlate = spider_host_xlate, }; -static void spider_irq_cascade (unsigned int irq,struct irq_desc *desc) +static void spider_irq_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct spider_pic *pic =irq_desc_get_handler_data (desc);
arch/powerpc/platforms/chrp/setup.c +1 -1
@@ -363,7 +363,7 @@ void __init chrp_setup_arch(void)if (ppc_md.progress) ppc_md.progress ("Linux/PPC " UTS_RELEASE "\n" ,0x0 ); } -static void chrp_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void chrp_8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
arch/powerpc/platforms/embedded6xx/hlwd-pic.c +1 -1
@@ -120,7 +120,7 @@ static unsigned int __hlwd_pic_get_irq(struct irq_domain *h)return irq_linear_revmap (h, irq); } -static void hlwd_pic_irq_cascade (unsigned int cascade_virq, +static void hlwd_pic_irq_cascade (unsigned int __cascade_virq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);
arch/powerpc/platforms/embedded6xx/mvme5100.c +1 -1
@@ -42,7 +42,7 @@static phys_addr_t pci_membase;static u_char *restart; -static void mvme5100_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void mvme5100_8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
arch/powerpc/platforms/pseries/setup.c +1 -1
@@ -111,7 +111,7 @@ static void __init fwnmi_init(void) fwnmi_active =1 ; } -static void pseries_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void pseries_8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
arch/powerpc/sysdev/ge/ge_pic.c +1 -1
@@ -91,7 +91,7 @@ static int gef_pic_cascade_irq;* should be masked out. */ -void gef_pic_cascade (unsigned int irq,struct irq_desc *desc) +void gef_pic_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq;
arch/powerpc/sysdev/tsi108_pci.c +1 -1
@@ -428,7 +428,7 @@ void __init tsi108_pci_int_init(struct device_node *node)init_pci_source (); } -void tsi108_irq_cascade (unsigned int irq,struct irq_desc *desc) +void tsi108_irq_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =get_pci_source ();
arch/powerpc/sysdev/uic.c +1 -1
@@ -194,7 +194,7 @@ static const struct irq_domain_ops uic_host_ops = { .xlate = irq_domain_xlate_twocell, }; -void uic_irq_cascade (unsigned int virq,struct irq_desc *desc) +void uic_irq_cascade (unsigned int __virq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct irq_data *idata =irq_desc_get_irq_data (desc);
arch/powerpc/sysdev/xilinx_intc.c +1 -1
@@ -222,7 +222,7 @@ int xilinx_intc_get_irq(void)/* * Support code for cascading to 8259 interrupt controllers */ -static void xilinx_i8259_cascade (unsigned int irq,struct irq_desc *desc) +static void xilinx_i8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
arch/sh/boards/mach-se/7343/irq.c +2 -1
@@ -29,8 +29,9 @@static void __iomem *se7343_irq_regs;struct irq_domain *se7343_irq_domain; -static void se7343_irq_demux (unsigned int irq,struct irq_desc *desc) +static void se7343_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_data *data =irq_get_irq_data (irq);struct irq_chip *chip =irq_data_get_irq_chip (data);unsigned long mask;
arch/sh/boards/mach-se/7722/irq.c +2 -1
@@ -28,8 +28,9 @@static void __iomem *se7722_irq_regs;struct irq_domain *se7722_irq_domain; -static void se7722_irq_demux (unsigned int irq,struct irq_desc *desc) +static void se7722_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_data *data =irq_get_irq_data (irq);struct irq_chip *chip =irq_data_get_irq_chip (data);unsigned long mask;
arch/sh/boards/mach-se/7724/irq.c +2 -1
@@ -92,8 +92,9 @@ static struct irq_chip se7724_irq_chip __read_mostly = { .irq_unmask = enable_se7724_irq, }; -static void se7724_irq_demux (unsigned int irq,struct irq_desc *desc) +static void se7724_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct fpga_irq set =get_fpga_irq (irq);unsigned short intv =__raw_readw (set.sraddr);unsigned int ext_irq = set.base;
arch/sh/boards/mach-x3proto/gpio.c +3 -1
@@ -60,8 +60,10 @@ static int x3proto_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)return virq; } -static void x3proto_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void x3proto_gpio_irq_handler (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_data *data =irq_get_irq_data (irq);struct irq_chip *chip =irq_data_get_irq_chip (data);unsigned long mask;
arch/sh/cchips/hd6446x/hd64461.c +1 -1
@@ -56,7 +56,7 @@ static struct irq_chip hd64461_irq_chip = { .irq_unmask = hd64461_unmask_irq, }; -static void hd64461_irq_demux (unsigned int irq,struct irq_desc *desc) +static void hd64461_irq_demux (unsigned int __irq,struct irq_desc *desc) {unsigned short intv =__raw_readw (HD64461_NIRR );unsigned int ext_irq =HD64461_IRQBASE ;
arch/tile/kernel/pci_gx.c +2 -1
@@ -304,8 +304,9 @@ static struct irq_chip tilegx_legacy_irq_chip = {* to Linux which just calls handle_level_irq() after clearing the * MAC INTx Assert status bit associated with this interrupt. */ -static void trio_handle_level_irq (unsigned int irq,struct irq_desc *desc) +static void trio_handle_level_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct pci_controller *controller =irq_desc_get_handler_data (desc);gxio_trio_context_t *trio_context = controller->trio;uint64_t intx = (uint64_t )irq_desc_get_chip_data (desc);
arch/unicore32/kernel/irq.c +1 -1
@@ -113,7 +113,7 @@ static struct irq_chip puv3_low_gpio_chip = {* and call the handler. */ static void -puv3_gpio_handler (unsigned int irq,struct irq_desc *desc) +puv3_gpio_handler (unsigned int __irq,struct irq_desc *desc) {unsigned int mask;
arch/x86/lguest/boot.c +1 -1
@@ -1021,7 +1021,7 @@ static struct clock_event_device lguest_clockevent = {* This is the Guest timer interrupt handler (hardware interrupt 0). We just * call the clockevent infrastructure and it does whatever needs doing. */ -static void lguest_time_irq (unsigned int irq,struct irq_desc *desc) +static void lguest_time_irq (unsigned int __irq,struct irq_desc *desc) {unsigned long flags;
drivers/dma/ipu/ipu_irq.c +4 -2
@@ -266,8 +266,9 @@ int ipu_irq_unmap(unsigned int source) }/* Chained IRQ handler for IPU error interrupt */ -static void ipu_irq_err (unsigned int irq,struct irq_desc *desc) +static void ipu_irq_err (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct ipu *ipu =irq_get_handler_data (irq);u32 status;int i, line;
@@ -307,8 +308,9 @@ static void ipu_irq_err(unsigned int irq, struct irq_desc *desc) }/* Chained IRQ handler for IPU function interrupt */ -static void ipu_irq_fn (unsigned int irq,struct irq_desc *desc) +static void ipu_irq_fn (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct ipu *ipu =irq_desc_get_handler_data (desc);u32 status;int i, line;
drivers/gpio/gpio-bcm-kona.c +3 -1
@@ -433,8 +433,10 @@ static int bcm_kona_gpio_irq_set_type(struct irq_data *d, unsigned int type)return 0 ; } -static void bcm_kona_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void bcm_kona_gpio_irq_handler (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);void __iomem *reg_base;int bit, bank_id;unsigned long sta;
drivers/gpio/gpio-davinci.c +2 -1
@@ -327,8 +327,9 @@ static struct irq_chip gpio_irqchip = { };static void -gpio_irq_handler (unsigned irq,struct irq_desc *desc) +gpio_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct davinci_gpio_regs __iomem *g;u32 mask =0xffff ;struct davinci_gpio_controller *d;
drivers/gpio/gpio-dwapb.c +2 -1
@@ -147,8 +147,9 @@ static u32 dwapb_do_irq(struct dwapb_gpio *gpio)return ret; } -static void dwapb_irq_handler (u32 irq,struct irq_desc *desc) +static void dwapb_irq_handler (u32 __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct dwapb_gpio *gpio =irq_get_handler_data (irq);struct irq_chip *chip =irq_desc_get_chip (desc);
drivers/gpio/gpio-ep93xx.c +5 -2
@@ -78,7 +78,8 @@ static void ep93xx_gpio_int_debounce(unsigned int irq, bool enable) EP93XX_GPIO_REG(int_debounce_register_offset[port])); } -static void ep93xx_gpio_ab_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ep93xx_gpio_ab_irq_handler (unsigned int __irq, +struct irq_desc *desc) {unsigned char status;int i;
@@ -100,8 +101,10 @@ static void ep93xx_gpio_ab_irq_handler(unsigned int irq, struct irq_desc *desc) } } -static void ep93xx_gpio_f_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ep93xx_gpio_f_irq_handler (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);/* * map discontiguous hw irq range to continuous sw irq range: *
drivers/gpio/gpio-mpc8xxx.c +2 -1
@@ -185,7 +185,8 @@ static int mpc8xxx_gpio_to_irq(struct gpio_chip *gc, unsigned offset)return -ENXIO ; } -static void mpc8xxx_gpio_irq_cascade (unsigned int irq,struct irq_desc *desc) +static void mpc8xxx_gpio_irq_cascade (unsigned int __irq, +struct irq_desc *desc) {struct mpc8xxx_gpio_chip *mpc8xxx_gc =irq_desc_get_handler_data (desc);struct irq_chip *chip =irq_desc_get_chip (desc);
drivers/gpio/gpio-msic.c +1 -1
@@ -232,7 +232,7 @@ static struct irq_chip msic_irqchip = { .irq_bus_sync_unlock = msic_bus_sync_unlock, }; -static void msic_gpio_irq_handler (unsigned irq,struct irq_desc *desc) +static void msic_gpio_irq_handler (unsigned __irq,struct irq_desc *desc) {struct irq_data *data =irq_desc_get_irq_data (desc);struct msic_gpio *mg =irq_data_get_irq_handler_data (data);
drivers/gpio/gpio-msm-v2.c +1 -1
@@ -313,7 +313,7 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int flow_type)* which have been set as summary IRQ lines and which are triggered, * and to call their interrupt handlers. */ -static void msm_summary_irq_handler (unsigned int irq,struct irq_desc *desc) +static void msm_summary_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long i;struct irq_chip *chip =irq_desc_get_chip (desc);
drivers/gpio/gpio-mvebu.c +2 -1
@@ -458,8 +458,9 @@ static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type)return 0 ; } -static void mvebu_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void mvebu_gpio_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct mvebu_gpio_chip *mvchip =irq_get_handler_data (irq);struct irq_chip *chip =irq_desc_get_chip (desc);u32 cause, type;
drivers/gpio/gpio-mxc.c +4 -2
@@ -272,8 +272,9 @@ static void mxc_gpio_irq_handler(struct mxc_gpio_port *port, u32 irq_stat) }/* MX1 and MX3 has one interrupt *per* gpio port */ -static void mx3_gpio_irq_handler (u32 irq,struct irq_desc *desc) +static void mx3_gpio_irq_handler (u32 __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);u32 irq_stat;struct mxc_gpio_port *port =irq_get_handler_data (irq);struct irq_chip *chip =irq_get_chip (irq);
@@ -288,8 +289,9 @@ static void mx3_gpio_irq_handler(u32 irq, struct irq_desc *desc) }/* MX2 has one interrupt *for all* gpio ports */ -static void mx2_gpio_irq_handler (u32 irq,struct irq_desc *desc) +static void mx2_gpio_irq_handler (u32 __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);u32 irq_msk, irq_stat;struct mxc_gpio_port *port;struct irq_chip *chip =irq_get_chip (irq);
drivers/gpio/gpio-mxs.c +2 -1
@@ -154,8 +154,9 @@ static void mxs_flip_edge(struct mxs_gpio_port *port, u32 gpio) }/* MXS has one interrupt *per* gpio port */ -static void mxs_gpio_irq_handler (u32 irq,struct irq_desc *desc) +static void mxs_gpio_irq_handler (u32 __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);u32 irq_stat;struct mxs_gpio_port *port =irq_get_handler_data (irq);
drivers/gpio/gpio-pxa.c +1 -1
@@ -401,7 +401,7 @@ static int pxa_gpio_irq_type(struct irq_data *d, unsigned int type)return 0 ; } -static void pxa_gpio_demux_handler (unsigned int irq,struct irq_desc *desc) +static void pxa_gpio_demux_handler (unsigned int __irq,struct irq_desc *desc) {struct pxa_gpio_chip *c;int loop, gpio, gpio_base, n;
drivers/gpio/gpio-sa1100.c +1 -1
@@ -173,7 +173,7 @@ static struct irq_domain *sa1100_gpio_irqdomain;* and call the handler. */ static void -sa1100_gpio_handler (unsigned int irq,struct irq_desc *desc) +sa1100_gpio_handler (unsigned int __irq,struct irq_desc *desc) {unsigned int mask;
drivers/gpio/gpio-tegra.c +2 -1
@@ -266,8 +266,9 @@ static void tegra_gpio_irq_shutdown(struct irq_data *d)gpiochip_unlock_as_irq (&tegra_gpio_chip, gpio); } -static void tegra_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void tegra_gpio_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct tegra_gpio_bank *bank;int port;int pin;
drivers/gpio/gpio-timberdale.c +2 -1
@@ -192,8 +192,9 @@ out:return ret; } -static void timbgpio_irq (unsigned int irq,struct irq_desc *desc) +static void timbgpio_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct timbgpio *tgpio =irq_get_handler_data (irq);unsigned long ipr;int offset;
drivers/gpio/gpio-tz1090.c +1 -1
@@ -375,7 +375,7 @@ static int gpio_set_irq_wake(struct irq_data *data, unsigned int on)#define gpio_set_irq_wake NULL#endif -static void tz1090_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void tz1090_gpio_irq_handler (unsigned int __irq,struct irq_desc *desc) {irq_hw_number_t hw;unsigned int irq_stat, irq_no;
drivers/gpu/ipu-v3/ipu-common.c +4 -2
@@ -912,8 +912,9 @@ static void ipu_irq_handle(struct ipu_soc *ipu, const int *regs, int num_regs) } } -static void ipu_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ipu_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct ipu_soc *ipu =irq_desc_get_handler_data (desc);const int int_reg[] = {0 ,1 ,2 ,3 ,10 ,11 ,12 ,13 ,14 };struct irq_chip *chip =irq_get_chip (irq);
@@ -925,8 +926,9 @@ static void ipu_irq_handler(unsigned int irq, struct irq_desc *desc)chained_irq_exit (chip, desc); } -static void ipu_err_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ipu_err_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct ipu_soc *ipu =irq_desc_get_handler_data (desc);const int int_reg[] = {4 ,5 ,8 ,9 };struct irq_chip *chip =irq_get_chip (irq);
drivers/irqchip/exynos-combiner.c +3 -1
@@ -60,8 +60,10 @@ static void combiner_unmask_irq(struct irq_data *data)__raw_writel (mask,combiner_base (data) +COMBINER_ENABLE_SET ); } -static void combiner_handle_cascade_irq (unsigned int irq,struct irq_desc *desc) +static void combiner_handle_cascade_irq (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct combiner_chip_data *chip_data =irq_get_handler_data (irq);struct irq_chip *chip =irq_get_chip (irq);unsigned int cascade_irq, combiner_irq;
drivers/irqchip/irq-armada-370-xp.c +2 -1
@@ -448,9 +448,10 @@ static void armada_370_xp_handle_msi_irq(struct pt_regs *regs, bool is_chained)static void armada_370_xp_handle_msi_irq (struct pt_regs *r,bool b) {}#endif -static void armada_370_xp_mpic_handle_cascade_irq (unsigned int irq, +static void armada_370_xp_mpic_handle_cascade_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_chip *chip =irq_get_chip (irq);unsigned long irqmap, irqn, irqsrc, cpuid;unsigned int cascade_irq;
drivers/irqchip/irq-bcm7038-l1.c +1 -1
@@ -116,7 +116,7 @@ static inline void l1_writel(u32 val, void __iomem *reg)writel (val, reg); } -static void bcm7038_l1_irq_handle (unsigned int irq,struct irq_desc *desc) +static void bcm7038_l1_irq_handle (unsigned int __irq,struct irq_desc *desc) {struct bcm7038_l1_chip *intc =irq_desc_get_handler_data (desc);struct bcm7038_l1_cpu *cpu;
drivers/irqchip/irq-bcm7120-l2.c +2 -1
@@ -52,7 +52,8 @@ struct bcm7120_l2_intc_data {const __be32 *map_mask_prop; }; -static void bcm7120_l2_intc_irq_handle (unsigned int irq,struct irq_desc *desc) +static void bcm7120_l2_intc_irq_handle (unsigned int __irq, +struct irq_desc *desc) {struct bcm7120_l2_intc_data *b =irq_desc_get_handler_data (desc);struct irq_chip *chip =irq_desc_get_chip (desc);
drivers/irqchip/irq-brcmstb-l2.c +3 -1
@@ -51,8 +51,10 @@ struct brcmstb_l2_intc_data {u32 saved_mask;/* for suspend/resume */ }; -static void brcmstb_l2_intc_irq_handle (unsigned int irq,struct irq_desc *desc) +static void brcmstb_l2_intc_irq_handle (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct brcmstb_l2_intc_data *b =irq_desc_get_handler_data (desc);struct irq_chip_generic *gc =irq_get_domain_generic_chip (b->domain,0 );struct irq_chip *chip =irq_desc_get_chip (desc);
drivers/irqchip/irq-dw-apb-ictl.c +2 -1
@@ -26,8 +26,9 @@#define APB_INT_FINALSTATUS_L 0x30#define APB_INT_FINALSTATUS_H 0x34 -static void dw_apb_ictl_handler (unsigned int irq,struct irq_desc *desc) +static void dw_apb_ictl_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct irq_chip_generic *gc =irq_get_handler_data (irq);struct irq_domain *d = gc->private;
drivers/irqchip/irq-gic.c +2 -1
@@ -286,8 +286,9 @@ static void __exception_irq_entry gic_handle_irq(struct pt_regs *regs) }while (1 ); } -static void gic_handle_cascade_irq (unsigned int irq,struct irq_desc *desc) +static void gic_handle_cascade_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct gic_chip_data *chip_data =irq_get_handler_data (irq);struct irq_chip *chip =irq_get_chip (irq);unsigned int cascade_irq, gic_irq;
drivers/irqchip/irq-imgpdc.c +3 -2
@@ -218,8 +218,9 @@ static int pdc_irq_set_wake(struct irq_data *data, unsigned int on)return 0 ; } -static void pdc_intc_perip_isr (unsigned int irq,struct irq_desc *desc) +static void pdc_intc_perip_isr (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct pdc_intc_priv *priv;unsigned int i, irq_no;
@@ -239,7 +240,7 @@ found:generic_handle_irq (irq_no); } -static void pdc_intc_syswake_isr (unsigned int irq,struct irq_desc *desc) +static void pdc_intc_syswake_isr (unsigned int __irq,struct irq_desc *desc) {struct pdc_intc_priv *priv;unsigned int syswake, irq_no;
drivers/irqchip/irq-keystone.c +2 -1
@@ -84,8 +84,9 @@ static void keystone_irq_ack(struct irq_data *d)/* nothing to do here */ } -static void keystone_irq_handler (unsigned irq,struct irq_desc *desc) +static void keystone_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct keystone_irq_device *kirq =irq_desc_get_handler_data (desc);unsigned long pending;int src, virq;
drivers/irqchip/irq-metag.c +2 -1
@@ -220,7 +220,8 @@ static int metag_internal_irq_set_affinity(struct irq_data *data,* occurred. It is this function's job to demux this irq and * figure out exactly which trigger needs servicing. */ -static void metag_internal_irq_demux (unsigned int irq,struct irq_desc *desc) +static void metag_internal_irq_demux (unsigned int __irq, +struct irq_desc *desc) {struct metag_internal_irq_priv *priv =irq_desc_get_handler_data (desc);irq_hw_number_t hw;
drivers/irqchip/irq-metag-ext.c +1 -1
@@ -447,7 +447,7 @@ static int meta_intc_irq_set_type(struct irq_data *data, unsigned int flow_type)* Whilst using TR2 to detect external interrupts is a software convention it is * (hopefully) unlikely to change. */ -static void meta_intc_irq_demux (unsigned int irq,struct irq_desc *desc) +static void meta_intc_irq_demux (unsigned int __irq,struct irq_desc *desc) {struct meta_intc_priv *priv = &meta_intc_priv;irq_hw_number_t hw;
drivers/irqchip/irq-mips-gic.c +1 -1
@@ -513,7 +513,7 @@ static void __gic_irq_dispatch(void)gic_handle_shared_int (); } -static void gic_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void gic_irq_dispatch (unsigned int __irq,struct irq_desc *desc) {__gic_irq_dispatch (); }
drivers/irqchip/irq-mmp.c +2 -1
@@ -130,8 +130,9 @@ struct irq_chip icu_irq_chip = { .irq_unmask = icu_unmask_irq, }; -static void icu_mux_irq_demux (unsigned int irq,struct irq_desc *desc) +static void icu_mux_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_domain *domain;struct icu_chip_data *data;int i;
drivers/irqchip/irq-orion.c +3 -1
@@ -107,8 +107,10 @@ IRQCHIP_DECLARE(orion_intc, "marvell,orion-intc", orion_irq_init);#define ORION_BRIDGE_IRQ_CAUSE 0x00#define ORION_BRIDGE_IRQ_MASK 0x04 -static void orion_bridge_irq_handler (unsigned int irq,struct irq_desc *desc) +static void orion_bridge_irq_handler (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_domain *d =irq_get_handler_data (irq);struct irq_chip_generic *gc =irq_get_domain_generic_chip (d,0 );
drivers/irqchip/irq-s3c24xx.c +1 -1
@@ -299,7 +299,7 @@ static struct irq_chip s3c_irq_eint0t4 = { .irq_set_type = s3c_irqext0_type, }; -static void s3c_irq_demux (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct s3c_irq_data *irq_data =irq_desc_get_chip_data (desc);
drivers/irqchip/irq-sunxi-nmi.c +2 -1
@@ -58,8 +58,9 @@ static inline u32 sunxi_sc_nmi_read(struct irq_chip_generic *gc, u32 off)return irq_reg_readl (gc, off); } -static void sunxi_sc_nmi_handle_irq (unsigned int irq,struct irq_desc *desc) +static void sunxi_sc_nmi_handle_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_domain *domain =irq_desc_get_handler_data (desc);struct irq_chip *chip =irq_get_chip (irq);unsigned int virq =irq_find_mapping (domain,0 );
drivers/irqchip/irq-tb10x.c +2 -1
@@ -97,8 +97,9 @@ static int tb10x_irq_set_type(struct irq_data *data, unsigned int flow_type)return IRQ_SET_MASK_OK ; } -static void tb10x_irq_cascade (unsigned int irq,struct irq_desc *desc) +static void tb10x_irq_cascade (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_domain *domain =irq_desc_get_handler_data (desc);generic_handle_irq (irq_find_mapping (domain, irq));
drivers/irqchip/irq-versatile-fpga.c +2 -1
@@ -66,8 +66,9 @@ static void fpga_irq_unmask(struct irq_data *d)writel (mask, f->base +IRQ_ENABLE_SET ); } -static void fpga_irq_handle (unsigned int irq,struct irq_desc *desc) +static void fpga_irq_handle (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct fpga_irq_data *f =irq_desc_get_handler_data (desc);u32 status =readl (f->base +IRQ_STATUS );
drivers/irqchip/irq-vic.c +1 -1
@@ -226,7 +226,7 @@ static int handle_one_vic(struct vic_device *vic, struct pt_regs *regs)return handled; } -static void vic_handle_irq_cascaded (unsigned int irq,struct irq_desc *desc) +static void vic_handle_irq_cascaded (unsigned int __irq,struct irq_desc *desc) {u32 stat, hwirq;struct irq_chip *host_chip =irq_desc_get_chip (desc);
drivers/irqchip/spear-shirq.c +2 -1
@@ -183,8 +183,9 @@ static struct spear_shirq *spear320_shirq_blocks[] = { &spear320_shirq_intrcomm_ras, }; -static void shirq_handler (unsigned irq,struct irq_desc *desc) +static void shirq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct spear_shirq *shirq =irq_get_handler_data (irq);u32 pend;
drivers/mfd/asic3.c +1 -1
@@ -138,7 +138,7 @@ static void asic3_irq_flip_edge(struct asic3 *asic,spin_unlock_irqrestore (&asic->lock, flags); } -static void asic3_irq_demux (unsigned int irq,struct irq_desc *desc) +static void asic3_irq_demux (unsigned int __irq,struct irq_desc *desc) {struct asic3 *asic =irq_desc_get_handler_data (desc);struct irq_data *data =irq_desc_get_irq_data (desc);
drivers/mfd/ezx-pcap.c +2 -1
@@ -205,8 +205,9 @@ static void pcap_isr_work(struct work_struct *work) }while (gpio_get_value (pdata->gpio)); } -static void pcap_irq_handler (unsigned int irq,struct irq_desc *desc) +static void pcap_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct pcap_chip *pcap =irq_get_handler_data (irq); desc->irq_data.chip->irq_ack (&desc->irq_data);
drivers/mfd/htc-egpio.c +1 -1
@@ -98,7 +98,7 @@ static struct irq_chip egpio_muxed_chip = { .irq_unmask = egpio_unmask, }; -static void egpio_handler (unsigned int irq,struct irq_desc *desc) +static void egpio_handler (unsigned int __irq,struct irq_desc *desc) {struct egpio_info *ei =irq_desc_get_handler_data (desc);int irqpin;
drivers/mfd/jz4740-adc.c +1 -1
@@ -65,7 +65,7 @@ struct jz4740_adc {spinlock_t lock; }; -static void jz4740_adc_irq_demux (unsigned int irq,struct irq_desc *desc) +static void jz4740_adc_irq_demux (unsigned int __irq,struct irq_desc *desc) {struct irq_chip_generic *gc =irq_desc_get_handler_data (desc);uint8_t status;
drivers/mfd/pm8921-core.c +1 -1
@@ -156,7 +156,7 @@ static int pm8xxx_irq_master_handler(struct pm_irq_chip *chip, int master)return ret; } -static void pm8xxx_irq_handler (unsigned int irq,struct irq_desc *desc) +static void pm8xxx_irq_handler (unsigned int __irq,struct irq_desc *desc) {struct pm_irq_chip *chip =irq_desc_get_handler_data (desc);struct irq_chip *irq_chip =irq_desc_get_chip (desc);
drivers/mfd/t7l66xb.c +2 -1
@@ -185,8 +185,9 @@ static struct mfd_cell t7l66xb_cells[] = {/*--------------------------------------------------------------------------*/ /* Handle the T7L66XB interrupt mux */ -static void t7l66xb_irq (unsigned int irq,struct irq_desc *desc) +static void t7l66xb_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct t7l66xb *t7l66xb =irq_get_handler_data (irq);unsigned int isr;unsigned int i, irq_base;
drivers/mfd/tc6393xb.c +2 -1
@@ -523,8 +523,9 @@ static int tc6393xb_register_gpio(struct tc6393xb *tc6393xb, int gpio_base)/*--------------------------------------------------------------------------*/ static void -tc6393xb_irq (unsigned int irq,struct irq_desc *desc) +tc6393xb_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct tc6393xb *tc6393xb =irq_get_handler_data (irq);unsigned int isr;unsigned int i, irq_base;
drivers/mfd/ucb1x00-core.c +2 -1
@@ -282,8 +282,9 @@ void ucb1x00_adc_disable(struct ucb1x00 *ucb)* SIBCLK to talk to the chip. We leave the clock running until * we have finished processing all interrupts from the chip. */ -static void ucb1x00_irq (unsigned int irq,struct irq_desc *desc) +static void ucb1x00_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct ucb1x00 *ucb =irq_desc_get_handler_data (desc);unsigned int isr, i;
drivers/pci/host/pci-keystone.c +5 -2
@@ -112,8 +112,9 @@ static int ks_pcie_establish_link(struct keystone_pcie *ks_pcie)return 0 ; } -static void ks_pcie_msi_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ks_pcie_msi_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct keystone_pcie *ks_pcie =irq_desc_get_handler_data (desc);u32 offset = irq - ks_pcie->msi_host_irqs[0 ];struct pcie_port *pp = &ks_pcie->pp;
@@ -139,8 +140,10 @@ static void ks_pcie_msi_irq_handler(unsigned int irq, struct irq_desc *desc)* Traverse through pending legacy interrupts and invoke handler for each. Also * takes care of interrupt controller level mask/ack operation. */ -static void ks_pcie_legacy_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ks_pcie_legacy_irq_handler (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct keystone_pcie *ks_pcie =irq_desc_get_handler_data (desc);struct pcie_port *pp = &ks_pcie->pp;u32 irq_offset = irq - ks_pcie->legacy_host_irqs[0 ];
drivers/pinctrl/mediatek/pinctrl-mtk-common.c +2 -1
@@ -1116,8 +1116,9 @@ mtk_eint_debounce_process(struct mtk_pinctrl *pctl, int index) } } -static void mtk_eint_irq_handler (unsigned irq,struct irq_desc *desc) +static void mtk_eint_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct mtk_pinctrl *pctl =irq_get_handler_data (irq);unsigned int status, eint_num;
drivers/pinctrl/pinctrl-adi2.c +2 -2
@@ -530,8 +530,8 @@ static inline void preflow_handler(struct irq_desc *desc)static inline void preflow_handler (struct irq_desc *desc) { }#endif -static void adi_gpio_handle_pint_irq (unsigned int inta_irq, -struct irq_desc *desc) +static void adi_gpio_handle_pint_irq (unsigned int __inta_irq, +struct irq_desc *desc) {u32 request;u32 level_mask, hwirq;
drivers/pinctrl/pinctrl-rockchip.c +2 -1
@@ -1394,8 +1394,9 @@ static const struct gpio_chip rockchip_gpiolib_chip = {* Interrupt handling */ -static void rockchip_irq_demux (unsigned int irq,struct irq_desc *desc) +static void rockchip_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct rockchip_pin_bank *bank =irq_get_handler_data (irq);u32 pend;
drivers/pinctrl/pinctrl-single.c +2 -1
@@ -1679,8 +1679,9 @@ static irqreturn_t pcs_irq_handler(int irq, void *d)* Use this if you have a separate interrupt for each * pinctrl-single instance. */ -static void pcs_irq_chain_handler (unsigned int irq,struct irq_desc *desc) +static void pcs_irq_chain_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct pcs_soc_data *pcs_soc =irq_desc_get_handler_data (desc);struct irq_chip *chip;
drivers/pinctrl/pinctrl-st.c +2 -1
@@ -1472,8 +1472,9 @@ static void st_gpio_irq_handler(unsigned irq, struct irq_desc *desc)chained_irq_exit (chip, desc); } -static void st_gpio_irqmux_handler (unsigned irq,struct irq_desc *desc) +static void st_gpio_irqmux_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct st_pinctrl *info =irq_get_handler_data (irq);unsigned long status;
drivers/pinctrl/samsung/pinctrl-exynos.c +5 -2
@@ -420,8 +420,9 @@ static const struct of_device_id exynos_wkup_irq_ids[] = { };/* interrupt handler for wakeup interrupts 0..15 */ -static void exynos_irq_eint0_15 (unsigned int irq,struct irq_desc *desc) +static void exynos_irq_eint0_15 (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct exynos_weint_data *eintd =irq_get_handler_data (irq);struct samsung_pin_bank *bank = eintd->bank;struct irq_chip *chip =irq_get_chip (irq);
@@ -452,8 +453,10 @@ static inline void exynos_irq_demux_eint(unsigned long pend, }/* interrupt handler for wakeup interrupt 16 */ -static void exynos_irq_demux_eint16_31 (unsigned int irq,struct irq_desc *desc) +static void exynos_irq_demux_eint16_31 (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct exynos_muxed_weint_data *eintd =irq_get_handler_data (irq);struct samsung_pinctrl_drv_data *d = eintd->banks[0 ]->drvdata;
drivers/pinctrl/samsung/pinctrl-s3c64xx.c +2 -1
@@ -408,8 +408,9 @@ static const struct irq_domain_ops s3c64xx_gpio_irqd_ops = { .xlate = irq_domain_xlate_twocell, }; -static void s3c64xx_eint_gpio_irq (unsigned int irq,struct irq_desc *desc) +static void s3c64xx_eint_gpio_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct s3c64xx_eint_gpio_data *data =irq_get_handler_data (irq);struct samsung_pinctrl_drv_data *drvdata = data->drvdata;
drivers/pinctrl/sunxi/pinctrl-sunxi.c +2 -1
@@ -709,8 +709,9 @@ static struct irq_chip sunxi_pinctrl_level_irq_chip = { IRQCHIP_EOI_IF_HANDLED, }; -static void sunxi_pinctrl_irq_handler (unsigned irq,struct irq_desc *desc) +static void sunxi_pinctrl_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct sunxi_pinctrl *pctl =irq_get_handler_data (irq);unsigned long bank, reg, val;
drivers/sh/intc/core.c +2 -1
@@ -65,8 +65,9 @@ void intc_set_prio_level(unsigned int irq, unsigned int level)raw_spin_unlock_irqrestore (&intc_big_lock, flags); } -static void intc_redirect_irq (unsigned int irq,struct irq_desc *desc) +static void intc_redirect_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);generic_handle_irq ((unsigned int )irq_get_handler_data (irq)); }
drivers/sh/intc/virq.c +2 -1
@@ -107,8 +107,9 @@ static int add_virq_to_pirq(unsigned int irq, unsigned int virq)return 0 ; } -static void intc_virq_handler (unsigned int irq,struct irq_desc *desc) +static void intc_virq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_data *data =irq_get_irq_data (irq);struct irq_chip *chip =irq_data_get_irq_chip (data);struct intc_virq_list *entry, *vlist =irq_data_get_irq_handler_data (data);
drivers/spmi/spmi-pmic-arb.c +2 -1
@@ -451,8 +451,9 @@ static void periph_interrupt(struct spmi_pmic_arb_dev *pa, u8 apid) } } -static void pmic_arb_chained_irq (unsigned int irq,struct irq_desc *desc) +static void pmic_arb_chained_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct spmi_pmic_arb_dev *pa =irq_get_handler_data (irq);struct irq_chip *chip =irq_get_chip (irq);void __iomem *intr = pa->intr;
kernel/irq/chip.c +14 -7
@@ -383,8 +383,9 @@ static bool irq_may_run(struct irq_desc *desc)* unmask issues if necessary. */ void -handle_simple_irq (unsigned int irq,struct irq_desc *desc) +handle_simple_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);raw_spin_lock (&desc->lock);if (!irq_may_run (desc))
@@ -434,8 +435,9 @@ static void cond_unmask_irq(struct irq_desc *desc)* interrupt line is back to inactive. */ void -handle_level_irq (unsigned int irq,struct irq_desc *desc) +handle_level_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);raw_spin_lock (&desc->lock);mask_ack_irq (desc);
@@ -505,8 +507,9 @@ static void cond_unmask_eoi_irq(struct irq_desc *desc, struct irq_chip *chip)* details in hardware, transparently. */ void -handle_fasteoi_irq (unsigned int irq,struct irq_desc *desc) +handle_fasteoi_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_chip *chip = desc->irq_data.chip;raw_spin_lock (&desc->lock);
@@ -561,8 +564,9 @@ EXPORT_SYMBOL_GPL(handle_fasteoi_irq);* loop is left. */ void -handle_edge_irq (unsigned int irq,struct irq_desc *desc) +handle_edge_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);raw_spin_lock (&desc->lock); desc->istate &= ~(IRQS_REPLAY |IRQS_WAITING );
@@ -624,8 +628,9 @@ EXPORT_SYMBOL(handle_edge_irq);* Similar as the above handle_edge_irq, but using eoi and w/o the * mask/unmask logic. */ -void handle_edge_eoi_irq (unsigned int irq,struct irq_desc *desc) +void handle_edge_eoi_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_chip *chip =irq_desc_get_chip (desc);raw_spin_lock (&desc->lock);
@@ -671,8 +676,9 @@ out_eoi:* Per CPU interrupts on SMP machines without locking requirements */ void -handle_percpu_irq (unsigned int irq,struct irq_desc *desc) +handle_percpu_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_chip *chip =irq_desc_get_chip (desc);kstat_incr_irqs_this_cpu (irq, desc);
@@ -698,8 +704,9 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc)* contain the real device id for the cpu on which this handler is * called */ -void handle_percpu_devid_irq (unsigned int irq,struct irq_desc *desc) +void handle_percpu_devid_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);struct irq_chip *chip =irq_desc_get_chip (desc);struct irqaction *action = desc->action;void *dev_id =raw_cpu_ptr (action->percpu_dev_id);
kernel/irq/handle.c +2 -1
@@ -27,8 +27,9 @@* * Handles spurious and unhandled IRQ's. It also prints a debugmessage. */ -void handle_bad_irq (unsigned int irq,struct irq_desc *desc) +void handle_bad_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_get_desc_irq (desc);print_irq_desc (irq, desc);kstat_incr_irqs_this_cpu (irq, desc);ack_bad_irq (irq);
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
In reply to Thomas GleixnerQuoted 1 line
unsigned irq = irq_desc_get_irq(desc);
Actually, I put the wrong name for this in my semantic patch. I will send a new version and new results shortly.
julia
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
In reply to Thomas GleixnerQuoted 1 line
unsigned irq = irq_desc_get_irq(desc);
Actually, it seems that this function doesn't exist in linux-next either. What is the correct name of the function, or is there some other tree that I should be working on?
thanks,
julia
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Quoted 5 lines · Julia Lawall
Quoted 1 line
unsigned irq = irq_desc_get_irq(desc);Actually, it seems that this function doesn't exist in linux-next either. What is the correct name of the function, or is there some other tree that I should be working on?
That's a new helper function, which is introduced in that series.
Thanks,
tglx
--- include/linux/irqdesc.h | 5 +++++ 1 file changed, 5 insertions(+)
include/linux/irqdesc.h +5 -0
@@ -100,6 +100,11 @@ static inline struct irq_desc *irq_data_to_desc(struct irq_data *data)#endif } +static inline unsigned int irq_desc_get_irq (struct irq_desc *desc) +{ +return desc->irq_data.irq; +} +static inline struct irq_data *irq_desc_get_irq_data (struct irq_desc *desc) {return &desc->irq_data;
Signature · 1 line
1.7.10.4
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
A new version of the semantic patch is below. The results are attached.
julia
virtual after_start
@initialize:ocaml@
@@
let tbl = Hashtbl.create(100) let ltbl = Hashtbl.create(100)
let add_if_not_present f p = try let _ = Hashtbl.find tbl f in () with Not_found ->
Hashtbl.add tbl f p;
let it = new iteration() in it#add_virtual_rule After_start; it#add_virtual_identifier Hf f; it#register()
let local_add_if_not_present f file = try let _ = Hashtbl.find ltbl (f,file) in () with Not_found ->
Hashtbl.add ltbl (f,file) ();
let it = new iteration() in it#set_files [file]; it#add_virtual_rule After_start; it#add_virtual_identifier Hf f; it#register()
// ------------------------------------------------------------------------ // Getting started
@h depends on !after_start@ identifier ih != NULL;
local idexpression lih; expression eh;
expression e1,e2,e3,e4,e5,e6,e7; position p;
@@
(
__irq_set_handler@p(e1,\(lih\|ih\|eh\),e2,e3)
|
irq_set_handler@p(e1,\(lih\|ih\|eh\))
|
irq_set_chained_handler@p(e1,\(lih\|ih\|eh\))
|
irq_alloc_generic_chip@p(e1,e2,e3,\(lih\|ih\|eh\))
| irq_alloc_domain_generic_chips@p(e1,e2,e3,e4,\(lih\|ih\|eh\),e5,e6,e7) |
irq_set_chip_and_handler_name@p(e1,e2,\(lih\|ih\|eh\),e3)
|
irq_set_chip_and_handler@p(e1,e2,\(lih\|ih\|eh\))
|
__irq_set_handler_locked@p(e1,\(lih\|ih\|eh\))
| __irq_set_chip_handler_name_locked@p(e1,e2,\(lih\|ih\|eh\),e3) |
__irq_set_preflow_handler@p(e1,\(lih\|ih\|eh\))
)
@localfn@
identifier h.ih;
@@
ih(...) { ... }
@script:ocaml depends on !localfn@ p << h.p;
handler << h.ih;
@@
add_if_not_present handler p
@script:ocaml depends on localfn@ p << h.p;
handler << h.ih;
@@
local_add_if_not_present handler (List.hd p).file
@script:ocaml@
p << h.p;
handler << h.lih;
@@
Printf.eprintf "Local variable: %s:%d %s\n"
((List.hd p).file) ((List.hd p).line) handler
@script:ocaml@
p << h.p;
handler << h.eh;
@@
if not (handler = "NULL")
then Printf.eprintf "Arbitrary expression: %s:%d %s\n"
((List.hd p).file) ((List.hd p).line) handler
// ------------------------------------------------------------------------ // Adjusting functions
@@
identifier virtual.hf,irq; fresh identifier firq = "__" ## irq; type T;
@@
hf(T
- irq
+ firq
,...) {
... when != irq
when strict
}
@s@
identifier virtual.hf,irq; position p1;
type T;
@@
hf(T irq,...) {
<...
(irq@p1 = <+...irq...+>)
...>
}
@s1@
identifier virtual.hf,irq; position p1;
expression e;
statement S;
type T;
@@
hf(T irq,...) {
<...
for(...; ...; <+...irq@p1 = e...+>) S ...>
}
// first parameter is assigned at least once @r exists@
identifier virtual.hf,irq;
expression e;
type T;
position p,p1 != {s.p1,s1.p1};
@@
hf(T@p irq,...) {
... when != irq
when strict
irq@p1 = e
... when any
}
// no uses of the first parameter before the assignment @@
identifier virtual.hf,irq;
expression e;
type T;
fresh identifier firq = "__" ## irq;
position r.p,p1 != {s.p1,s1.p1};
@@
hf(T@p
- irq
+ firq
,...) {
... when != irq
when strict
? irq@p1 = e
... when any
}
// first parameter is used somewhere @rr exists@
identifier virtual.hf,irq;
type T;
position p;
@@
hf(T@p irq,...) {
...
irq
... when any
}
@@
identifier virtual.hf,irq,desc; fresh identifier firq = "__" ## irq; type T,T1;
position rr.p;
@@
hf(T@p
- irq
+ firq
,T1 desc) {
+ unsigned int irq = irq_desc_get_irq(desc); ... when any
}
var/julia/linuxcopy/arch/arm/common/locomo.c renamed from var/linuxes/linux-next/arch/arm/common/locomo.c +2 -1
@@ -138,8 +138,9 @@ static struct locomo_dev_info locomo_dev }, }; -static void locomo_handler (unsigned int irq,struct irq_desc *desc) +static void locomo_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct locomo *lchip =irq_get_chip_data (irq);int req, i;
var/julia/linuxcopy/arch/arm/common/sa1111.c renamed from var/linuxes/linux-next/arch/arm/common/sa1111.c +2 -1
@@ -197,8 +197,9 @@ static struct sa1111_dev_info sa1111_dev* will call us again if there are more interrupts to process. */ static void -sa1111_irq_handler (unsigned int irq,struct irq_desc *desc) +sa1111_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);unsigned int stat0, stat1, i;struct sa1111 *sachip =irq_get_handler_data (irq);void __iomem *mapbase = sachip->base +SA1111_INTC ;
var/julia/linuxcopy/arch/arm/mach-dove/irq.c renamed from var/linuxes/linux-next/arch/arm/mach-dove/irq.c +2 -1
@@ -69,8 +69,9 @@ static struct irq_chip pmu_irq_chip = { .irq_ack = pmu_irq_ack, }; -static void pmu_irq_handler (unsigned int irq,struct irq_desc *desc) +static void pmu_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);unsigned long cause =readl (PMU_INTERRUPT_CAUSE ); cause &=readl (PMU_INTERRUPT_MASK );
var/julia/linuxcopy/arch/arm/mach-footbridge/isa-irq.c renamed from var/linuxes/linux-next/arch/arm/mach-footbridge/isa-irq.c +1 -1
@@ -88,7 +88,7 @@ static struct irq_chip isa_hi_chip = { };static void -isa_irq_handler (unsigned int irq,struct irq_desc *desc) +isa_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned int isa_irq = *(unsigned char *)PCIIACK_BASE ;
var/julia/linuxcopy/arch/arm/mach-gemini/gpio.c renamed from var/linuxes/linux-next/arch/arm/mach-gemini/gpio.c +1 -1
@@ -126,7 +126,7 @@ static int gpio_set_irq_type(struct irq_return 0 ; } -static void gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void gpio_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned int port = (unsigned int )irq_desc_get_handler_data (desc);unsigned int gpio_irq_no, irq_stat;
var/julia/linuxcopy/arch/arm/mach-imx/3ds_debugboard.c renamed from var/linuxes/linux-next/arch/arm/mach-imx/3ds_debugboard.c +1 -1
@@ -85,7 +85,7 @@ static struct platform_device smsc_lan92 .resource = smsc911x_resources, }; -static void mxc_expio_irq_handler (u32 irq,struct irq_desc *desc) +static void mxc_expio_irq_handler (u32 __irq,struct irq_desc *desc) {u32 imr_val;u32 int_valid;
var/julia/linuxcopy/arch/arm/mach-imx/mach-mx31ads.c renamed from var/linuxes/linux-next/arch/arm/mach-imx/mach-mx31ads.c +1 -1
@@ -154,7 +154,7 @@ static inline void mxc_init_imx_uart(voiimx31_add_imx_uart0 (&uart_pdata); } -static void mx31ads_expio_irq_handler (u32 irq,struct irq_desc *desc) +static void mx31ads_expio_irq_handler (u32 __irq,struct irq_desc *desc) {u32 imr_val;u32 int_valid;
var/julia/linuxcopy/arch/arm/mach-iop13xx/msi.c renamed from var/linuxes/linux-next/arch/arm/mach-iop13xx/msi.c +1 -1
@@ -91,7 +91,7 @@ static void (*write_imipr[])(u32) = { write_imipr_3, }; -static void iop13xx_msi_handler (unsigned int irq,struct irq_desc *desc) +static void iop13xx_msi_handler (unsigned int __irq,struct irq_desc *desc) {int i, j;unsigned long status;
var/julia/linuxcopy/arch/arm/mach-lpc32xx/irq.c renamed from var/linuxes/linux-next/arch/arm/mach-lpc32xx/irq.c +2 -2
@@ -370,7 +370,7 @@ static struct irq_chip lpc32xx_irq_chip .irq_set_wake = lpc32xx_irq_wake }; -static void lpc32xx_sic1_handler (unsigned int irq,struct irq_desc *desc) +static void lpc32xx_sic1_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long ints =__raw_readl (LPC32XX_INTC_STAT (LPC32XX_SIC1_BASE ));
@@ -383,7 +383,7 @@ static void lpc32xx_sic1_handler(unsigne } } -static void lpc32xx_sic2_handler (unsigned int irq,struct irq_desc *desc) +static void lpc32xx_sic2_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long ints =__raw_readl (LPC32XX_INTC_STAT (LPC32XX_SIC2_BASE ));
var/julia/linuxcopy/arch/arm/mach-netx/generic.c renamed from var/linuxes/linux-next/arch/arm/mach-netx/generic.c +1 -1
@@ -70,7 +70,7 @@ static struct platform_device *devices[]#endif static void -netx_hif_demux_handler (unsigned int irq_unused,struct irq_desc *desc) +netx_hif_demux_handler (unsigned int __irq_unused,struct irq_desc *desc) {unsigned int irq =NETX_IRQ_HIF_CHAINED (0 );unsigned int stat;
var/julia/linuxcopy/arch/arm/mach-omap1/fpga.c renamed from var/linuxes/linux-next/arch/arm/mach-omap1/fpga.c +2 -1
@@ -87,7 +87,8 @@ static void fpga_mask_ack_irq(struct irqfpga_ack_irq (d); } -static void innovator_fpga_IRQ_demux (unsigned int irq,struct irq_desc *desc) +static void innovator_fpga_IRQ_demux (unsigned int __irq, +struct irq_desc *desc) {u32 stat;int fpga_irq;
var/julia/linuxcopy/arch/arm/mach-omap2/prm_common.c renamed from var/linuxes/linux-next/arch/arm/mach-omap2/prm_common.c +1 -1
@@ -102,7 +102,7 @@ static void omap_prcm_events_filter_prio* dispatched accordingly. Clearing of the wakeup events should be * done by the SoC specific individual handlers. */ -static void omap_prcm_irq_handler (unsigned int irq,struct irq_desc *desc) +static void omap_prcm_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending[OMAP_PRCM_MAX_NR_PENDING_REG ];unsigned long priority_pending[OMAP_PRCM_MAX_NR_PENDING_REG ];
var/julia/linuxcopy/arch/arm/mach-pxa/balloon3.c renamed from var/linuxes/linux-next/arch/arm/mach-pxa/balloon3.c +1 -1
@@ -496,7 +496,7 @@ static struct irq_chip balloon3_irq_chip .irq_unmask = balloon3_unmask_irq, }; -static void balloon3_irq_handler (unsigned int irq,struct irq_desc *desc) +static void balloon3_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending =__raw_readl (BALLOON3_INT_CONTROL_REG ) & balloon3_irq_enabled;
var/julia/linuxcopy/arch/arm/mach-pxa/cm-x2xx-pci.c renamed from var/linuxes/linux-next/arch/arm/mach-pxa/cm-x2xx-pci.c +2 -1
@@ -29,8 +29,9 @@void __iomem *it8152_base_address;static int cmx2xx_it8152_irq_gpio; -static void cmx2xx_it8152_irq_demux (unsigned int irq,struct irq_desc *desc) +static void cmx2xx_it8152_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);/* clear our parent irq */ desc->irq_data.chip->irq_ack (&desc->irq_data);
var/julia/linuxcopy/arch/arm/mach-pxa/lpd270.c renamed from var/linuxes/linux-next/arch/arm/mach-pxa/lpd270.c +1 -1
@@ -120,7 +120,7 @@ static struct irq_chip lpd270_irq_chip = .irq_unmask = lpd270_unmask_irq, }; -static void lpd270_irq_handler (unsigned int irq,struct irq_desc *desc) +static void lpd270_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending;
var/julia/linuxcopy/arch/arm/mach-pxa/pcm990-baseboard.c renamed from var/linuxes/linux-next/arch/arm/mach-pxa/pcm990-baseboard.c +1 -1
@@ -284,7 +284,7 @@ static struct irq_chip pcm990_irq_chip = .irq_unmask = pcm990_unmask_irq, }; -static void pcm990_irq_handler (unsigned int irq,struct irq_desc *desc) +static void pcm990_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending;
var/julia/linuxcopy/arch/arm/mach-pxa/viper.c renamed from var/linuxes/linux-next/arch/arm/mach-pxa/viper.c +1 -1
@@ -276,7 +276,7 @@ static inline unsigned long viper_irq_pe viper_irq_enabled_mask; } -static void viper_irq_handler (unsigned int irq,struct irq_desc *desc) +static void viper_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending;
var/julia/linuxcopy/arch/arm/mach-pxa/zeus.c renamed from var/linuxes/linux-next/arch/arm/mach-pxa/zeus.c +1 -1
@@ -105,7 +105,7 @@ static inline unsigned long zeus_irq_penreturn __raw_readw (ZEUS_CPLD_ISA_IRQ ) & zeus_irq_enabled_mask; } -static void zeus_irq_handler (unsigned int irq,struct irq_desc *desc) +static void zeus_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending;
var/julia/linuxcopy/arch/arm/mach-rpc/ecard.c renamed from var/linuxes/linux-next/arch/arm/mach-rpc/ecard.c +1 -1
@@ -552,7 +552,7 @@ static void ecard_check_lockup(struct ir }static void -ecard_irq_handler (unsigned int irq,struct irq_desc *desc) +ecard_irq_handler (unsigned int __irq,struct irq_desc *desc) {ecard_t *ec;int called =0 ;
var/julia/linuxcopy/arch/arm/mach-s3c24xx/bast-irq.c renamed from var/linuxes/linux-next/arch/arm/mach-s3c24xx/bast-irq.c +1 -1
@@ -101,7 +101,7 @@ static struct irq_chip bast_pc104_chip };static void -bast_irq_pc104_demux (unsigned int irq, +bast_irq_pc104_demux (unsigned int __irq,struct irq_desc *desc) {unsigned int stat;
var/julia/linuxcopy/arch/arm/mach-s3c64xx/common.c renamed from var/linuxes/linux-next/arch/arm/mach-s3c64xx/common.c +4 -4
@@ -389,22 +389,22 @@ static inline void s3c_irq_demux_eint(un } } -static void s3c_irq_demux_eint0_3 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint0_3 (unsigned int __irq,struct irq_desc *desc) {s3c_irq_demux_eint (0 ,3 ); } -static void s3c_irq_demux_eint4_11 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint4_11 (unsigned int __irq,struct irq_desc *desc) {s3c_irq_demux_eint (4 ,11 ); } -static void s3c_irq_demux_eint12_19 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint12_19 (unsigned int __irq,struct irq_desc *desc) {s3c_irq_demux_eint (12 ,19 ); } -static void s3c_irq_demux_eint20_27 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint20_27 (unsigned int __irq,struct irq_desc *desc) {s3c_irq_demux_eint (20 ,27 ); }
var/julia/linuxcopy/arch/arm/mach-sa1100/neponset.c renamed from var/linuxes/linux-next/arch/arm/mach-sa1100/neponset.c +1 -1
@@ -166,7 +166,7 @@ static struct sa1100_port_fns neponset_p* ensure that the IRQ signal is deasserted before returning. This * is rather unfortunate. */ -static void neponset_irq_handler (unsigned int irq,struct irq_desc *desc) +static void neponset_irq_handler (unsigned int __irq,struct irq_desc *desc) {struct neponset_drvdata *d =irq_desc_get_handler_data (desc);unsigned int irr;
var/julia/linuxcopy/arch/arm/plat-orion/gpio.c renamed from var/linuxes/linux-next/arch/arm/plat-orion/gpio.c +2 -1
@@ -407,8 +407,9 @@ static int gpio_irq_set_type(struct irq_return 0 ; } -static void gpio_irq_handler (unsigned irq,struct irq_desc *desc) +static void gpio_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct orion_gpio_chip *ochip =irq_get_handler_data (irq);u32 cause, type;int i;
var/julia/linuxcopy/arch/avr32/mach-at32ap/extint.c renamed from var/linuxes/linux-next/arch/avr32/mach-at32ap/extint.c +1 -1
@@ -144,7 +144,7 @@ static struct irq_chip eic_chip = { .irq_set_type = eic_set_irq_type, }; -static void demux_eic_irq (unsigned int irq,struct irq_desc *desc) +static void demux_eic_irq (unsigned int __irq,struct irq_desc *desc) {struct eic *eic =irq_desc_get_handler_data (desc);unsigned long status, pending;
var/julia/linuxcopy/arch/avr32/mach-at32ap/pio.c renamed from var/linuxes/linux-next/arch/avr32/mach-at32ap/pio.c +2 -1
@@ -281,8 +281,9 @@ static struct irq_chip gpio_irqchip = { .irq_set_type = gpio_irq_type, }; -static void gpio_irq_handler (unsigned irq,struct irq_desc *desc) +static void gpio_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct pio_device *pio =irq_desc_get_chip_data (desc);unsigned gpio_irq;
var/julia/linuxcopy/arch/blackfin/mach-bf537/ints-priority.c renamed from var/linuxes/linux-next/arch/blackfin/mach-bf537/ints-priority.c +3 -2
@@ -89,7 +89,7 @@ static struct irq_chip bf537_generic_err .irq_unmask = bf537_generic_error_unmask_irq, }; -static void bf537_demux_error_irq (unsigned int int_err_irq, +static void bf537_demux_error_irq (unsigned int __int_err_irq,struct irq_desc *inta_desc) {int irq =0 ;
@@ -182,9 +182,10 @@ static struct irq_chip bf537_mac_rx_irqc .irq_unmask = bf537_mac_rx_unmask_irq, }; -static void bf537_demux_mac_rx_irq (unsigned int int_irq, +static void bf537_demux_mac_rx_irq (unsigned int __int_irq,struct irq_desc *desc) { +unsigned int int_irq =irq_desc_get_irq (desc);if (bfin_read_DMA1_IRQ_STATUS () & (DMA_DONE |DMA_ERR ))bfin_handle_irq (IRQ_MAC_RX );else
var/julia/linuxcopy/arch/blackfin/mach-common/ints-priority.c renamed from var/linuxes/linux-next/arch/blackfin/mach-common/ints-priority.c +4 -3
@@ -655,7 +655,7 @@ static struct irq_chip bfin_mac_status_i .irq_set_wake = bfin_mac_status_set_wake, }; -void bfin_demux_mac_status_irq (unsigned int int_err_irq, +void bfin_demux_mac_status_irq (unsigned int ____int_err_irq,struct irq_desc *inta_desc) {int i, irq =0 ;
@@ -824,9 +824,10 @@ static void bfin_demux_gpio_block(unsign } } -void bfin_demux_gpio_irq (unsigned int inta_irq, -struct irq_desc *desc) +void bfin_demux_gpio_irq (unsigned int __inta_irq, +struct irq_desc *desc) { +unsigned int inta_irq =irq_desc_get_irq (desc);unsigned int irq;switch (inta_irq) {
var/julia/linuxcopy/arch/c6x/platforms/megamod-pic.c renamed from var/linuxes/linux-next/arch/c6x/platforms/megamod-pic.c +1 -1
@@ -93,7 +93,7 @@ static struct irq_chip megamod_chip = { .irq_unmask = unmask_megamod, }; -static void megamod_irq_cascade (unsigned int irq,struct irq_desc *desc) +static void megamod_irq_cascade (unsigned int __irq,struct irq_desc *desc) {struct megamod_cascade_data *cascade;struct megamod_pic *pic;
var/julia/linuxcopy/arch/m68k/amiga/amiints.c renamed from var/linuxes/linux-next/arch/m68k/amiga/amiints.c +4 -4
@@ -46,7 +46,7 @@ static struct irq_chip amiga_irq_chip =* The builtin Amiga hardware interrupt handlers. */ -static void ami_int1 (unsigned int irq,struct irq_desc *desc) +static void ami_int1 (unsigned int __irq,struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
@@ -69,7 +69,7 @@ static void ami_int1(unsigned int irq, s } } -static void ami_int3 (unsigned int irq,struct irq_desc *desc) +static void ami_int3 (unsigned int __irq,struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
@@ -92,7 +92,7 @@ static void ami_int3(unsigned int irq, s } } -static void ami_int4 (unsigned int irq,struct irq_desc *desc) +static void ami_int4 (unsigned int __irq,struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
@@ -121,7 +121,7 @@ static void ami_int4(unsigned int irq, s } } -static void ami_int5 (unsigned int irq,struct irq_desc *desc) +static void ami_int5 (unsigned int __irq,struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
var/julia/linuxcopy/arch/m68k/coldfire/intc-5272.c renamed from var/linuxes/linux-next/arch/m68k/coldfire/intc-5272.c +2 -1
@@ -143,8 +143,9 @@ static int intc_irq_set_type(struct irq_* We need to be careful with the masking/acking due to the side effects * of masking an interrupt. */ -static void intc_external_irq (unsigned int irq,struct irq_desc *desc) +static void intc_external_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);irq_desc_get_chip (desc)->irq_ack (&desc->irq_data);handle_simple_irq (irq, desc); }
var/julia/linuxcopy/arch/m68k/mac/baboon.c renamed from var/linuxes/linux-next/arch/m68k/mac/baboon.c +1 -1
@@ -45,7 +45,7 @@ void __init baboon_init(void)* Baboon interrupt handler. This works a lot like a VIA. */ -static void baboon_irq (unsigned int irq,struct irq_desc *desc) +static void baboon_irq (unsigned int __irq,struct irq_desc *desc) {int irq_bit, irq_num;unsigned char events;
var/julia/linuxcopy/arch/m68k/mac/oss.c renamed from var/linuxes/linux-next/arch/m68k/mac/oss.c +3 -2
@@ -63,8 +63,9 @@ void __init oss_nubus_init(void)* Handle miscellaneous OSS interrupts. */ -static void oss_irq (unsigned int irq,struct irq_desc *desc) +static void oss_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);int events = oss->irq_pending & (OSS_IP_IOPSCC |OSS_IP_SCSI |OSS_IP_IOPISM );
@@ -97,7 +98,7 @@ static void oss_irq(unsigned int irq, st* Unlike the VIA/RBV this is on its own autovector interrupt level. */ -static void oss_nubus_irq (unsigned int irq,struct irq_desc *desc) +static void oss_nubus_irq (unsigned int __irq,struct irq_desc *desc) {int events, irq_bit, i;
var/julia/linuxcopy/arch/m68k/mac/psc.c renamed from var/linuxes/linux-next/arch/m68k/mac/psc.c +2 -1
@@ -113,8 +113,9 @@ void __init psc_init(void)* PSC interrupt handler. It's a lot like the VIA interrupt handler. */ -static void psc_irq (unsigned int irq,struct irq_desc *desc) +static void psc_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);unsigned int offset = (unsigned int )irq_desc_get_handler_data (desc);int pIFR = pIFRbase + offset;int pIER = pIERbase + offset;
var/julia/linuxcopy/arch/m68k/mac/via.c renamed from var/linuxes/linux-next/arch/m68k/mac/via.c +3 -3
@@ -446,7 +446,7 @@ void via_nubus_irq_shutdown(int irq)* via6522.c :-), disable/pending masks added. */ -void via1_irq (unsigned int irq,struct irq_desc *desc) +void via1_irq (unsigned int ____irq,struct irq_desc *desc) {int irq_num;unsigned char irq_bit, events;
@@ -467,7 +467,7 @@ void via1_irq(unsigned int irq, struct i }while (events >= irq_bit); } -static void via2_irq (unsigned int irq,struct irq_desc *desc) +static void via2_irq (unsigned int __irq,struct irq_desc *desc) {int irq_num;unsigned char irq_bit, events;
@@ -493,7 +493,7 @@ static void via2_irq(unsigned int irq, s* VIA2 dispatcher as a fast interrupt handler. */ -void via_nubus_irq (unsigned int irq,struct irq_desc *desc) +void via_nubus_irq (unsigned int __irq,struct irq_desc *desc) {int slot_irq;unsigned char slot_bit, events;
var/julia/linuxcopy/arch/mips/alchemy/common/irq.c renamed from var/linuxes/linux-next/arch/mips/alchemy/common/irq.c +1 -1
@@ -865,7 +865,7 @@ DISP(ic0r1, AU1000_INTC0_INT_BASE, AU100 DISP(ic1r0, AU1000_INTC1_INT_BASE, AU1000_IC1_PHYS_ADDR + IC_REQ0INT) DISP(ic1r1, AU1000_INTC1_INT_BASE, AU1000_IC1_PHYS_ADDR + IC_REQ1INT) -static void alchemy_gpic_dispatch (unsigned int irq,struct irq_desc *d) +static void alchemy_gpic_dispatch (unsigned int __irq,struct irq_desc *d) {int i =__raw_readl (AU1300_GPIC_ADDR +AU1300_GPIC_PRIENC );generic_handle_irq (ALCHEMY_GPIC_INT_BASE + i);
var/julia/linuxcopy/arch/mips/alchemy/devboards/bcsr.c renamed from var/linuxes/linux-next/arch/mips/alchemy/devboards/bcsr.c +2 -1
@@ -85,8 +85,9 @@ EXPORT_SYMBOL_GPL(bcsr_mod);/* * DB1200/PB1200 CPLD IRQ muxer */ -static void bcsr_csc_handler (unsigned int irq,struct irq_desc *d) +static void bcsr_csc_handler (unsigned int __irq,struct irq_desc *d) { +unsigned int irq =irq_desc_get_irq (d);unsigned short bisr =__raw_readw (bcsr_virt +BCSR_REG_INTSTAT );disable_irq_nosync (irq);
var/julia/linuxcopy/arch/mips/ath25/ar2315.c renamed from var/linuxes/linux-next/arch/mips/ath25/ar2315.c +1 -1
@@ -69,7 +69,7 @@ static struct irqaction ar2315_ahb_err_i .name = "ar2315-ahb-error", }; -static void ar2315_misc_irq_handler (unsigned irq,struct irq_desc *desc) +static void ar2315_misc_irq_handler (unsigned __irq,struct irq_desc *desc) {u32 pending =ar2315_rst_reg_read (AR2315_ISR ) &ar2315_rst_reg_read (AR2315_IMR );
var/julia/linuxcopy/arch/mips/ath25/ar5312.c renamed from var/linuxes/linux-next/arch/mips/ath25/ar5312.c +1 -1
@@ -73,7 +73,7 @@ static struct irqaction ar5312_ahb_err_i .name = "ar5312-ahb-error", }; -static void ar5312_misc_irq_handler (unsigned irq,struct irq_desc *desc) +static void ar5312_misc_irq_handler (unsigned __irq,struct irq_desc *desc) {u32 pending =ar5312_rst_reg_read (AR5312_ISR ) &ar5312_rst_reg_read (AR5312_IMR );
var/julia/linuxcopy/arch/mips/ath79/irq.c renamed from var/linuxes/linux-next/arch/mips/ath79/irq.c +9 -4
@@ -27,7 +27,7 @@#include "common.h" #include "machtypes.h" -static void ath79_misc_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ath79_misc_irq_handler (unsigned int __irq,struct irq_desc *desc) {void __iomem *base = ath79_reset_base;u32 pending;
@@ -120,8 +120,9 @@ static void __init ath79_misc_irq_init(virq_set_chained_handler (ATH79_CPU_IRQ (6 ), ath79_misc_irq_handler); } -static void ar934x_ip2_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void ar934x_ip2_irq_dispatch (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);u32 status;disable_irq_nosync (irq);
@@ -153,8 +154,10 @@ static void ar934x_ip2_irq_init(void)irq_set_chained_handler (ATH79_CPU_IRQ (2 ), ar934x_ip2_irq_dispatch); } -static void qca955x_ip2_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void qca955x_ip2_irq_dispatch (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);u32 status;disable_irq_nosync (irq);
@@ -181,8 +184,10 @@ enable:enable_irq (irq); } -static void qca955x_ip3_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void qca955x_ip3_irq_dispatch (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);u32 status;disable_irq_nosync (irq);
var/julia/linuxcopy/arch/mips/jz4740/gpio.c renamed from var/linuxes/linux-next/arch/mips/jz4740/gpio.c +2 -1
@@ -296,7 +296,8 @@ static void jz_gpio_check_trigger_both(swritel (mask, reg); } -static void jz_gpio_irq_demux_handler (unsigned int irq,struct irq_desc *desc) +static void jz_gpio_irq_demux_handler (unsigned int __irq, +struct irq_desc *desc) {uint32_t flag;unsigned int gpio_irq;
var/julia/linuxcopy/arch/mips/kernel/i8259.c renamed from var/linuxes/linux-next/arch/mips/kernel/i8259.c +2 -1
@@ -353,8 +353,9 @@ void __init init_i8259_irqs(void)__init_i8259_irqs (NULL ); } -static void i8259_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void i8259_irq_dispatch (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_domain *domain =irq_get_handler_data (irq);int hwirq =i8259_irq ();
var/julia/linuxcopy/arch/mips/netlogic/common/smp.c renamed from var/linuxes/linux-next/arch/mips/netlogic/common/smp.c +4 -2
@@ -82,8 +82,9 @@ void nlm_send_ipi_mask(const struct cpum }/* IRQ_IPI_SMP_FUNCTION Handler */ -void nlm_smp_function_ipi_handler (unsigned int irq,struct irq_desc *desc) +void nlm_smp_function_ipi_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);clear_c0_eimr (irq);ack_c0_eirr (irq);smp_call_function_interrupt ();
@@ -91,8 +92,9 @@ void nlm_smp_function_ipi_handler(unsign }/* IRQ_IPI_SMP_RESCHEDULE handler */ -void nlm_smp_resched_ipi_handler (unsigned int irq,struct irq_desc *desc) +void nlm_smp_resched_ipi_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);clear_c0_eimr (irq);ack_c0_eirr (irq);scheduler_ipi ();
var/julia/linuxcopy/arch/mips/pci/pci-ar2315.c renamed from var/linuxes/linux-next/arch/mips/pci/pci-ar2315.c +1 -1
@@ -318,7 +318,7 @@ static int ar2315_pci_host_setup(structreturn 0 ; } -static void ar2315_pci_irq_handler (unsigned irq,struct irq_desc *desc) +static void ar2315_pci_irq_handler (unsigned __irq,struct irq_desc *desc) {struct ar2315_pci_ctrl *apc =irq_desc_get_handler_data (desc); u32 pending = ar2315_pci_reg_read(apc, AR2315_PCI_ISR) &
var/julia/linuxcopy/arch/mips/pci/pci-ar71xx.c renamed from var/linuxes/linux-next/arch/mips/pci/pci-ar71xx.c +1 -1
@@ -226,7 +226,7 @@ static struct pci_ops ar71xx_pci_ops = { .write = ar71xx_pci_write_config, }; -static void ar71xx_pci_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ar71xx_pci_irq_handler (unsigned int __irq,struct irq_desc *desc) {struct ar71xx_pci_controller *apc;void __iomem *base = ath79_reset_base;
var/julia/linuxcopy/arch/mips/pci/pci-ar724x.c renamed from var/linuxes/linux-next/arch/mips/pci/pci-ar724x.c +1 -1
@@ -225,7 +225,7 @@ static struct pci_ops ar724x_pci_ops = { .write = ar724x_pci_write, }; -static void ar724x_pci_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ar724x_pci_irq_handler (unsigned int __irq,struct irq_desc *desc) {struct ar724x_pci_controller *apc;void __iomem *base;
var/julia/linuxcopy/arch/mips/pci/pci-rt3883.c renamed from var/linuxes/linux-next/arch/mips/pci/pci-rt3883.c +1 -1
@@ -129,7 +129,7 @@ static void rt3883_pci_write_cfg32(strucrt3883_pci_w32 (rpc, val,RT3883_PCI_REG_CFGDATA ); } -static void rt3883_pci_irq_handler (unsigned int irq,struct irq_desc *desc) +static void rt3883_pci_irq_handler (unsigned int __irq,struct irq_desc *desc) {struct rt3883_pci_controller *rpc;u32 pending;
var/julia/linuxcopy/arch/mips/ralink/irq.c renamed from var/linuxes/linux-next/arch/mips/ralink/irq.c +1 -1
@@ -95,7 +95,7 @@ unsigned int get_c0_compare_int(void)return CP0_LEGACY_COMPARE_IRQ ; } -static void ralink_intc_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ralink_intc_irq_handler (unsigned int __irq,struct irq_desc *desc) {u32 pending =rt_intc_r32 (INTC_REG_STATUS0 );
var/julia/linuxcopy/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c renamed from var/linuxes/linux-next/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c +1 -1
@@ -105,7 +105,7 @@ cpld_pic_get_irq(int offset, u8 ignore, }static void -cpld_pic_cascade (unsigned int irq,struct irq_desc *desc) +cpld_pic_cascade (unsigned int __irq,struct irq_desc *desc) { irq =cpld_pic_get_irq (0 ,PCI_IGNORE , &cpld_regs->pci_status, &cpld_regs->pci_mask);
var/julia/linuxcopy/arch/powerpc/platforms/52xx/media5200.c renamed from var/linuxes/linux-next/arch/powerpc/platforms/52xx/media5200.c +1 -1
@@ -80,7 +80,7 @@ static struct irq_chip media5200_irq_chi .irq_mask_ack = media5200_irq_mask, }; -void media5200_irq_cascade (unsigned int virq,struct irq_desc *desc) +void media5200_irq_cascade (unsigned int __virq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);int sub_virq, val;
var/julia/linuxcopy/arch/powerpc/platforms/52xx/mpc52xx_gpt.c renamed from var/linuxes/linux-next/arch/powerpc/platforms/52xx/mpc52xx_gpt.c +1 -1
@@ -191,7 +191,7 @@ static struct irq_chip mpc52xx_gpt_irq_c .irq_set_type = mpc52xx_gpt_irq_set_type, }; -void mpc52xx_gpt_irq_cascade (unsigned int virq,struct irq_desc *desc) +void mpc52xx_gpt_irq_cascade (unsigned int __virq,struct irq_desc *desc) {struct mpc52xx_gpt_priv *gpt =irq_desc_get_handler_data (desc);int sub_virq;
var/julia/linuxcopy/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c renamed from var/linuxes/linux-next/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +1 -1
@@ -78,7 +78,7 @@ static struct irq_chip pq2ads_pci_ic = { .irq_disable = pq2ads_pci_mask_irq }; -static void pq2ads_pci_irq_demux (unsigned int irq,struct irq_desc *desc) +static void pq2ads_pci_irq_demux (unsigned int __irq,struct irq_desc *desc) {struct pq2ads_pci_pic *priv =irq_desc_get_handler_data (desc);u32 stat, mask, pend;
var/julia/linuxcopy/arch/powerpc/platforms/85xx/common.c renamed from var/linuxes/linux-next/arch/powerpc/platforms/85xx/common.c +1 -1
@@ -49,7 +49,7 @@ int __init mpc85xx_common_publish_devicereturn of_platform_bus_probe (NULL , mpc85xx_common_ids,NULL ); }#ifdef CONFIG_CPM2 -static void cpm2_cascade (unsigned int irq,struct irq_desc *desc) +static void cpm2_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);int cascade_irq;
var/julia/linuxcopy/arch/powerpc/platforms/85xx/mpc85xx_cds.c renamed from var/linuxes/linux-next/arch/powerpc/platforms/85xx/mpc85xx_cds.c +2 -1
@@ -192,9 +192,10 @@ void mpc85xx_cds_fixup_bus(struct pci_bu }#ifdef CONFIG_PPC_I8259 -static void mpc85xx_8259_cascade_handler (unsigned int irq, +static void mpc85xx_8259_cascade_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);unsigned int cascade_irq =i8259_irq ();if (cascade_irq !=NO_IRQ )
var/julia/linuxcopy/arch/powerpc/platforms/85xx/mpc85xx_ds.c renamed from var/linuxes/linux-next/arch/powerpc/platforms/85xx/mpc85xx_ds.c +1 -1
@@ -46,7 +46,7 @@#endif #ifdef CONFIG_PPC_I8259 -static void mpc85xx_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void mpc85xx_8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
var/julia/linuxcopy/arch/powerpc/platforms/85xx/socrates_fpga_pic.c renamed from var/linuxes/linux-next/arch/powerpc/platforms/85xx/socrates_fpga_pic.c +2 -1
@@ -91,8 +91,9 @@ static inline unsigned int socrates_fpga (irq_hw_number_t)i); } -void socrates_fpga_pic_cascade (unsigned int irq,struct irq_desc *desc) +void socrates_fpga_pic_cascade (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq;
var/julia/linuxcopy/arch/powerpc/platforms/86xx/pic.c renamed from var/linuxes/linux-next/arch/powerpc/platforms/86xx/pic.c +1 -1
@@ -17,7 +17,7 @@#include <asm/i8259.h> #ifdef CONFIG_PPC_I8259 -static void mpc86xx_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void mpc86xx_8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
var/julia/linuxcopy/arch/powerpc/platforms/8xx/m8xx_setup.c renamed from var/linuxes/linux-next/arch/powerpc/platforms/8xx/m8xx_setup.c +1 -1
@@ -214,7 +214,7 @@ void mpc8xx_restart(char *cmd)panic ("Restart failed\n" ); } -static void cpm_cascade (unsigned int irq,struct irq_desc *desc) +static void cpm_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);int cascade_irq =cpm_get_irq ();
var/julia/linuxcopy/arch/powerpc/platforms/cell/axon_msi.c renamed from var/linuxes/linux-next/arch/powerpc/platforms/cell/axon_msi.c +1 -1
@@ -93,7 +93,7 @@ static void msic_dcr_write(struct axon_mdcr_write (msic->dcr_host, dcr_n, val); } -static void axon_msi_cascade (unsigned int irq,struct irq_desc *desc) +static void axon_msi_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct axon_msic *msic =irq_desc_get_handler_data (desc);
var/julia/linuxcopy/arch/powerpc/platforms/cell/interrupt.c renamed from var/linuxes/linux-next/arch/powerpc/platforms/cell/interrupt.c +2 -1
@@ -99,8 +99,9 @@ static void iic_ioexc_eoi(struct irq_dat { } -static void iic_ioexc_cascade (unsigned int irq,struct irq_desc *desc) +static void iic_ioexc_cascade (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_desc_get_chip (desc);struct cbe_iic_regs __iomem *node_iic = (void __iomem *)irq_desc_get_handler_data (desc);
var/julia/linuxcopy/arch/powerpc/platforms/cell/spider-pic.c renamed from var/linuxes/linux-next/arch/powerpc/platforms/cell/spider-pic.c +1 -1
@@ -199,7 +199,7 @@ static const struct irq_domain_ops spide .xlate = spider_host_xlate, }; -static void spider_irq_cascade (unsigned int irq,struct irq_desc *desc) +static void spider_irq_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct spider_pic *pic =irq_desc_get_handler_data (desc);
var/julia/linuxcopy/arch/powerpc/platforms/chrp/setup.c renamed from var/linuxes/linux-next/arch/powerpc/platforms/chrp/setup.c +1 -1
@@ -363,7 +363,7 @@ void __init chrp_setup_arch(void)if (ppc_md.progress) ppc_md.progress ("Linux/PPC " UTS_RELEASE "\n" ,0x0 ); } -static void chrp_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void chrp_8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
var/julia/linuxcopy/arch/powerpc/platforms/embedded6xx/hlwd-pic.c renamed from var/linuxes/linux-next/arch/powerpc/platforms/embedded6xx/hlwd-pic.c +1 -1
@@ -120,7 +120,7 @@ static unsigned int __hlwd_pic_get_irq(sreturn irq_linear_revmap (h, irq); } -static void hlwd_pic_irq_cascade (unsigned int cascade_virq, +static void hlwd_pic_irq_cascade (unsigned int __cascade_virq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);
var/julia/linuxcopy/arch/powerpc/platforms/embedded6xx/mvme5100.c renamed from var/linuxes/linux-next/arch/powerpc/platforms/embedded6xx/mvme5100.c +1 -1
@@ -42,7 +42,7 @@static phys_addr_t pci_membase;static u_char *restart; -static void mvme5100_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void mvme5100_8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
var/julia/linuxcopy/arch/powerpc/platforms/pseries/setup.c renamed from var/linuxes/linux-next/arch/powerpc/platforms/pseries/setup.c +1 -1
@@ -111,7 +111,7 @@ static void __init fwnmi_init(void) fwnmi_active =1 ; } -static void pseries_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void pseries_8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
var/julia/linuxcopy/arch/powerpc/sysdev/ge/ge_pic.c renamed from var/linuxes/linux-next/arch/powerpc/sysdev/ge/ge_pic.c +1 -1
@@ -91,7 +91,7 @@ static int gef_pic_cascade_irq;* should be masked out. */ -void gef_pic_cascade (unsigned int irq,struct irq_desc *desc) +void gef_pic_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq;
var/julia/linuxcopy/arch/powerpc/sysdev/tsi108_pci.c renamed from var/linuxes/linux-next/arch/powerpc/sysdev/tsi108_pci.c +1 -1
@@ -428,7 +428,7 @@ void __init tsi108_pci_int_init(struct dinit_pci_source (); } -void tsi108_irq_cascade (unsigned int irq,struct irq_desc *desc) +void tsi108_irq_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =get_pci_source ();
var/julia/linuxcopy/arch/powerpc/sysdev/uic.c renamed from var/linuxes/linux-next/arch/powerpc/sysdev/uic.c +1 -1
@@ -194,7 +194,7 @@ static const struct irq_domain_ops uic_h .xlate = irq_domain_xlate_twocell, }; -void uic_irq_cascade (unsigned int virq,struct irq_desc *desc) +void uic_irq_cascade (unsigned int __virq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct irq_data *idata =irq_desc_get_irq_data (desc);
var/julia/linuxcopy/arch/powerpc/sysdev/xilinx_intc.c renamed from var/linuxes/linux-next/arch/powerpc/sysdev/xilinx_intc.c +1 -1
@@ -222,7 +222,7 @@ int xilinx_intc_get_irq(void)/* * Support code for cascading to 8259 interrupt controllers */ -static void xilinx_i8259_cascade (unsigned int irq,struct irq_desc *desc) +static void xilinx_i8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
var/julia/linuxcopy/arch/sh/boards/mach-se/7343/irq.c renamed from var/linuxes/linux-next/arch/sh/boards/mach-se/7343/irq.c +2 -1
@@ -29,8 +29,9 @@static void __iomem *se7343_irq_regs;struct irq_domain *se7343_irq_domain; -static void se7343_irq_demux (unsigned int irq,struct irq_desc *desc) +static void se7343_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_data *data =irq_get_irq_data (irq);struct irq_chip *chip =irq_data_get_irq_chip (data);unsigned long mask;
var/julia/linuxcopy/arch/sh/boards/mach-se/7722/irq.c renamed from var/linuxes/linux-next/arch/sh/boards/mach-se/7722/irq.c +2 -1
@@ -28,8 +28,9 @@static void __iomem *se7722_irq_regs;struct irq_domain *se7722_irq_domain; -static void se7722_irq_demux (unsigned int irq,struct irq_desc *desc) +static void se7722_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_data *data =irq_get_irq_data (irq);struct irq_chip *chip =irq_data_get_irq_chip (data);unsigned long mask;
var/julia/linuxcopy/arch/sh/boards/mach-se/7724/irq.c renamed from var/linuxes/linux-next/arch/sh/boards/mach-se/7724/irq.c +2 -1
@@ -92,8 +92,9 @@ static struct irq_chip se7724_irq_chip _ .irq_unmask = enable_se7724_irq, }; -static void se7724_irq_demux (unsigned int irq,struct irq_desc *desc) +static void se7724_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct fpga_irq set =get_fpga_irq (irq);unsigned short intv =__raw_readw (set.sraddr);unsigned int ext_irq = set.base;
var/julia/linuxcopy/arch/sh/boards/mach-x3proto/gpio.c renamed from var/linuxes/linux-next/arch/sh/boards/mach-x3proto/gpio.c +3 -1
@@ -60,8 +60,10 @@ static int x3proto_gpio_to_irq(struct gpreturn virq; } -static void x3proto_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void x3proto_gpio_irq_handler (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_data *data =irq_get_irq_data (irq);struct irq_chip *chip =irq_data_get_irq_chip (data);unsigned long mask;
var/julia/linuxcopy/arch/sh/cchips/hd6446x/hd64461.c renamed from var/linuxes/linux-next/arch/sh/cchips/hd6446x/hd64461.c +1 -1
@@ -56,7 +56,7 @@ static struct irq_chip hd64461_irq_chip .irq_unmask = hd64461_unmask_irq, }; -static void hd64461_irq_demux (unsigned int irq,struct irq_desc *desc) +static void hd64461_irq_demux (unsigned int __irq,struct irq_desc *desc) {unsigned short intv =__raw_readw (HD64461_NIRR );unsigned int ext_irq =HD64461_IRQBASE ;
var/julia/linuxcopy/arch/tile/kernel/pci_gx.c renamed from var/linuxes/linux-next/arch/tile/kernel/pci_gx.c +2 -1
@@ -304,8 +304,9 @@ static struct irq_chip tilegx_legacy_irq* to Linux which just calls handle_level_irq() after clearing the * MAC INTx Assert status bit associated with this interrupt. */ -static void trio_handle_level_irq (unsigned int irq,struct irq_desc *desc) +static void trio_handle_level_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct pci_controller *controller =irq_desc_get_handler_data (desc);gxio_trio_context_t *trio_context = controller->trio;uint64_t intx = (uint64_t )irq_desc_get_chip_data (desc);
var/julia/linuxcopy/arch/unicore32/kernel/irq.c renamed from var/linuxes/linux-next/arch/unicore32/kernel/irq.c +1 -1
@@ -113,7 +113,7 @@ static struct irq_chip puv3_low_gpio_chi* and call the handler. */ static void -puv3_gpio_handler (unsigned int irq,struct irq_desc *desc) +puv3_gpio_handler (unsigned int __irq,struct irq_desc *desc) {unsigned int mask;
var/julia/linuxcopy/arch/x86/lguest/boot.c renamed from var/linuxes/linux-next/arch/x86/lguest/boot.c +1 -1
@@ -1021,7 +1021,7 @@ static struct clock_event_device lguest_* This is the Guest timer interrupt handler (hardware interrupt 0). We just * call the clockevent infrastructure and it does whatever needs doing. */ -static void lguest_time_irq (unsigned int irq,struct irq_desc *desc) +static void lguest_time_irq (unsigned int __irq,struct irq_desc *desc) {unsigned long flags;
var/julia/linuxcopy/drivers/dma/ipu/ipu_irq.c renamed from var/linuxes/linux-next/drivers/dma/ipu/ipu_irq.c +4 -2
@@ -266,8 +266,9 @@ int ipu_irq_unmap(unsigned int source) }/* Chained IRQ handler for IPU error interrupt */ -static void ipu_irq_err (unsigned int irq,struct irq_desc *desc) +static void ipu_irq_err (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct ipu *ipu =irq_get_handler_data (irq);u32 status;int i, line;
@@ -307,8 +308,9 @@ static void ipu_irq_err(unsigned int irq }/* Chained IRQ handler for IPU function interrupt */ -static void ipu_irq_fn (unsigned int irq,struct irq_desc *desc) +static void ipu_irq_fn (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct ipu *ipu =irq_desc_get_handler_data (desc);u32 status;int i, line;
var/julia/linuxcopy/drivers/gpio/gpio-bcm-kona.c renamed from var/linuxes/linux-next/drivers/gpio/gpio-bcm-kona.c +3 -1
@@ -433,8 +433,10 @@ static int bcm_kona_gpio_irq_set_type(streturn 0 ; } -static void bcm_kona_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void bcm_kona_gpio_irq_handler (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);void __iomem *reg_base;int bit, bank_id;unsigned long sta;
var/julia/linuxcopy/drivers/gpio/gpio-davinci.c renamed from var/linuxes/linux-next/drivers/gpio/gpio-davinci.c +2 -1
@@ -327,8 +327,9 @@ static struct irq_chip gpio_irqchip = { };static void -gpio_irq_handler (unsigned irq,struct irq_desc *desc) +gpio_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct davinci_gpio_regs __iomem *g;u32 mask =0xffff ;struct davinci_gpio_controller *d;
var/julia/linuxcopy/drivers/gpio/gpio-dwapb.c renamed from var/linuxes/linux-next/drivers/gpio/gpio-dwapb.c +2 -1
@@ -147,8 +147,9 @@ static u32 dwapb_do_irq(struct dwapb_gpireturn ret; } -static void dwapb_irq_handler (u32 irq,struct irq_desc *desc) +static void dwapb_irq_handler (u32 __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct dwapb_gpio *gpio =irq_get_handler_data (irq);struct irq_chip *chip =irq_desc_get_chip (desc);
var/julia/linuxcopy/drivers/gpio/gpio-ep93xx.c renamed from var/linuxes/linux-next/drivers/gpio/gpio-ep93xx.c +5 -2
@@ -78,7 +78,8 @@ static void ep93xx_gpio_int_debounce(uns EP93XX_GPIO_REG(int_debounce_register_offset[port])); } -static void ep93xx_gpio_ab_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ep93xx_gpio_ab_irq_handler (unsigned int __irq, +struct irq_desc *desc) {unsigned char status;int i;
@@ -100,8 +101,10 @@ static void ep93xx_gpio_ab_irq_handler(u } } -static void ep93xx_gpio_f_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ep93xx_gpio_f_irq_handler (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);/* * map discontiguous hw irq range to continuous sw irq range: *
var/julia/linuxcopy/drivers/gpio/gpio-mpc8xxx.c renamed from var/linuxes/linux-next/drivers/gpio/gpio-mpc8xxx.c +2 -1
@@ -185,7 +185,8 @@ static int mpc8xxx_gpio_to_irq(struct gpreturn -ENXIO ; } -static void mpc8xxx_gpio_irq_cascade (unsigned int irq,struct irq_desc *desc) +static void mpc8xxx_gpio_irq_cascade (unsigned int __irq, +struct irq_desc *desc) {struct mpc8xxx_gpio_chip *mpc8xxx_gc =irq_desc_get_handler_data (desc);struct irq_chip *chip =irq_desc_get_chip (desc);
var/julia/linuxcopy/drivers/gpio/gpio-msic.c renamed from var/linuxes/linux-next/drivers/gpio/gpio-msic.c +1 -1
@@ -232,7 +232,7 @@ static struct irq_chip msic_irqchip = { .irq_bus_sync_unlock = msic_bus_sync_unlock, }; -static void msic_gpio_irq_handler (unsigned irq,struct irq_desc *desc) +static void msic_gpio_irq_handler (unsigned __irq,struct irq_desc *desc) {struct irq_data *data =irq_desc_get_irq_data (desc);struct msic_gpio *mg =irq_data_get_irq_handler_data (data);
var/julia/linuxcopy/drivers/gpio/gpio-msm-v2.c renamed from var/linuxes/linux-next/drivers/gpio/gpio-msm-v2.c +1 -1
@@ -313,7 +313,7 @@ static int msm_gpio_irq_set_type(struct* which have been set as summary IRQ lines and which are triggered, * and to call their interrupt handlers. */ -static void msm_summary_irq_handler (unsigned int irq,struct irq_desc *desc) +static void msm_summary_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long i;struct irq_chip *chip =irq_desc_get_chip (desc);
var/julia/linuxcopy/drivers/gpio/gpio-mvebu.c renamed from var/linuxes/linux-next/drivers/gpio/gpio-mvebu.c +2 -1
@@ -458,8 +458,9 @@ static int mvebu_gpio_irq_set_type(strucreturn 0 ; } -static void mvebu_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void mvebu_gpio_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct mvebu_gpio_chip *mvchip =irq_get_handler_data (irq);struct irq_chip *chip =irq_desc_get_chip (desc);u32 cause, type;
var/julia/linuxcopy/drivers/gpio/gpio-mxc.c renamed from var/linuxes/linux-next/drivers/gpio/gpio-mxc.c +4 -2
@@ -272,8 +272,9 @@ static void mxc_gpio_irq_handler(struct }/* MX1 and MX3 has one interrupt *per* gpio port */ -static void mx3_gpio_irq_handler (u32 irq,struct irq_desc *desc) +static void mx3_gpio_irq_handler (u32 __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);u32 irq_stat;struct mxc_gpio_port *port =irq_get_handler_data (irq);struct irq_chip *chip =irq_get_chip (irq);
@@ -288,8 +289,9 @@ static void mx3_gpio_irq_handler(u32 irq }/* MX2 has one interrupt *for all* gpio ports */ -static void mx2_gpio_irq_handler (u32 irq,struct irq_desc *desc) +static void mx2_gpio_irq_handler (u32 __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);u32 irq_msk, irq_stat;struct mxc_gpio_port *port;struct irq_chip *chip =irq_get_chip (irq);
var/julia/linuxcopy/drivers/gpio/gpio-mxs.c renamed from var/linuxes/linux-next/drivers/gpio/gpio-mxs.c +2 -1
@@ -154,8 +154,9 @@ static void mxs_flip_edge(struct mxs_gpi }/* MXS has one interrupt *per* gpio port */ -static void mxs_gpio_irq_handler (u32 irq,struct irq_desc *desc) +static void mxs_gpio_irq_handler (u32 __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);u32 irq_stat;struct mxs_gpio_port *port =irq_get_handler_data (irq);
var/julia/linuxcopy/drivers/gpio/gpio-pxa.c renamed from var/linuxes/linux-next/drivers/gpio/gpio-pxa.c +1 -1
@@ -401,7 +401,7 @@ static int pxa_gpio_irq_type(struct irq_return 0 ; } -static void pxa_gpio_demux_handler (unsigned int irq,struct irq_desc *desc) +static void pxa_gpio_demux_handler (unsigned int __irq,struct irq_desc *desc) {struct pxa_gpio_chip *c;int loop, gpio, gpio_base, n;
var/julia/linuxcopy/drivers/gpio/gpio-sa1100.c renamed from var/linuxes/linux-next/drivers/gpio/gpio-sa1100.c +1 -1
@@ -173,7 +173,7 @@ static struct irq_domain *sa1100_gpio_ir* and call the handler. */ static void -sa1100_gpio_handler (unsigned int irq,struct irq_desc *desc) +sa1100_gpio_handler (unsigned int __irq,struct irq_desc *desc) {unsigned int mask;
var/julia/linuxcopy/drivers/gpio/gpio-tegra.c renamed from var/linuxes/linux-next/drivers/gpio/gpio-tegra.c +2 -1
@@ -266,8 +266,9 @@ static void tegra_gpio_irq_shutdown(strugpiochip_unlock_as_irq (&tegra_gpio_chip, gpio); } -static void tegra_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void tegra_gpio_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct tegra_gpio_bank *bank;int port;int pin;
var/julia/linuxcopy/drivers/gpio/gpio-timberdale.c renamed from var/linuxes/linux-next/drivers/gpio/gpio-timberdale.c +2 -1
@@ -192,8 +192,9 @@ out:return ret; } -static void timbgpio_irq (unsigned int irq,struct irq_desc *desc) +static void timbgpio_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct timbgpio *tgpio =irq_get_handler_data (irq);unsigned long ipr;int offset;
var/julia/linuxcopy/drivers/gpio/gpio-tz1090.c renamed from var/linuxes/linux-next/drivers/gpio/gpio-tz1090.c +1 -1
@@ -375,7 +375,7 @@ static int gpio_set_irq_wake(struct irq_#define gpio_set_irq_wake NULL#endif -static void tz1090_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void tz1090_gpio_irq_handler (unsigned int __irq,struct irq_desc *desc) {irq_hw_number_t hw;unsigned int irq_stat, irq_no;
var/julia/linuxcopy/drivers/gpu/ipu-v3/ipu-common.c renamed from var/linuxes/linux-next/drivers/gpu/ipu-v3/ipu-common.c +4 -2
@@ -912,8 +912,9 @@ static void ipu_irq_handle(struct ipu_so } } -static void ipu_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ipu_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct ipu_soc *ipu =irq_desc_get_handler_data (desc);const int int_reg[] = {0 ,1 ,2 ,3 ,10 ,11 ,12 ,13 ,14 };struct irq_chip *chip =irq_get_chip (irq);
@@ -925,8 +926,9 @@ static void ipu_irq_handler(unsigned intchained_irq_exit (chip, desc); } -static void ipu_err_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ipu_err_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct ipu_soc *ipu =irq_desc_get_handler_data (desc);const int int_reg[] = {4 ,5 ,8 ,9 };struct irq_chip *chip =irq_get_chip (irq);
var/julia/linuxcopy/drivers/irqchip/exynos-combiner.c renamed from var/linuxes/linux-next/drivers/irqchip/exynos-combiner.c +3 -1
@@ -60,8 +60,10 @@ static void combiner_unmask_irq(struct i__raw_writel (mask,combiner_base (data) +COMBINER_ENABLE_SET ); } -static void combiner_handle_cascade_irq (unsigned int irq,struct irq_desc *desc) +static void combiner_handle_cascade_irq (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct combiner_chip_data *chip_data =irq_get_handler_data (irq);struct irq_chip *chip =irq_get_chip (irq);unsigned int cascade_irq, combiner_irq;
var/julia/linuxcopy/drivers/irqchip/irq-armada-370-xp.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-armada-370-xp.c +2 -1
@@ -448,9 +448,10 @@ static void armada_370_xp_handle_msi_irqstatic void armada_370_xp_handle_msi_irq (struct pt_regs *r,bool b) {}#endif -static void armada_370_xp_mpic_handle_cascade_irq (unsigned int irq, +static void armada_370_xp_mpic_handle_cascade_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_get_chip (irq);unsigned long irqmap, irqn, irqsrc, cpuid;unsigned int cascade_irq;
var/julia/linuxcopy/drivers/irqchip/irq-bcm7038-l1.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-bcm7038-l1.c +1 -1
@@ -116,7 +116,7 @@ static inline void l1_writel(u32 val, vowritel (val, reg); } -static void bcm7038_l1_irq_handle (unsigned int irq,struct irq_desc *desc) +static void bcm7038_l1_irq_handle (unsigned int __irq,struct irq_desc *desc) {struct bcm7038_l1_chip *intc =irq_desc_get_handler_data (desc);struct bcm7038_l1_cpu *cpu;
var/julia/linuxcopy/drivers/irqchip/irq-bcm7120-l2.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-bcm7120-l2.c +2 -1
@@ -52,7 +52,8 @@ struct bcm7120_l2_intc_data {const __be32 *map_mask_prop; }; -static void bcm7120_l2_intc_irq_handle (unsigned int irq,struct irq_desc *desc) +static void bcm7120_l2_intc_irq_handle (unsigned int __irq, +struct irq_desc *desc) {struct bcm7120_l2_intc_data *b =irq_desc_get_handler_data (desc);struct irq_chip *chip =irq_desc_get_chip (desc);
var/julia/linuxcopy/drivers/irqchip/irq-brcmstb-l2.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-brcmstb-l2.c +3 -1
@@ -51,8 +51,10 @@ struct brcmstb_l2_intc_data {u32 saved_mask;/* for suspend/resume */ }; -static void brcmstb_l2_intc_irq_handle (unsigned int irq,struct irq_desc *desc) +static void brcmstb_l2_intc_irq_handle (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct brcmstb_l2_intc_data *b =irq_desc_get_handler_data (desc);struct irq_chip_generic *gc =irq_get_domain_generic_chip (b->domain,0 );struct irq_chip *chip =irq_desc_get_chip (desc);
var/julia/linuxcopy/drivers/irqchip/irq-dw-apb-ictl.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-dw-apb-ictl.c +2 -1
@@ -26,8 +26,9 @@#define APB_INT_FINALSTATUS_L 0x30#define APB_INT_FINALSTATUS_H 0x34 -static void dw_apb_ictl_handler (unsigned int irq,struct irq_desc *desc) +static void dw_apb_ictl_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct irq_chip_generic *gc =irq_get_handler_data (irq);struct irq_domain *d = gc->private;
var/julia/linuxcopy/drivers/irqchip/irq-gic.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-gic.c +2 -1
@@ -286,8 +286,9 @@ static void __exception_irq_entry gic_ha }while (1 ); } -static void gic_handle_cascade_irq (unsigned int irq,struct irq_desc *desc) +static void gic_handle_cascade_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct gic_chip_data *chip_data =irq_get_handler_data (irq);struct irq_chip *chip =irq_get_chip (irq);unsigned int cascade_irq, gic_irq;
var/julia/linuxcopy/drivers/irqchip/irq-imgpdc.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-imgpdc.c +3 -2
@@ -218,8 +218,9 @@ static int pdc_irq_set_wake(struct irq_dreturn 0 ; } -static void pdc_intc_perip_isr (unsigned int irq,struct irq_desc *desc) +static void pdc_intc_perip_isr (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct pdc_intc_priv *priv;unsigned int i, irq_no;
@@ -239,7 +240,7 @@ found:generic_handle_irq (irq_no); } -static void pdc_intc_syswake_isr (unsigned int irq,struct irq_desc *desc) +static void pdc_intc_syswake_isr (unsigned int __irq,struct irq_desc *desc) {struct pdc_intc_priv *priv;unsigned int syswake, irq_no;
var/julia/linuxcopy/drivers/irqchip/irq-keystone.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-keystone.c +2 -1
@@ -84,8 +84,9 @@ static void keystone_irq_ack(struct irq_/* nothing to do here */ } -static void keystone_irq_handler (unsigned irq,struct irq_desc *desc) +static void keystone_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct keystone_irq_device *kirq =irq_desc_get_handler_data (desc);unsigned long pending;int src, virq;
var/julia/linuxcopy/drivers/irqchip/irq-metag.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-metag.c +2 -1
@@ -220,7 +220,8 @@ static int metag_internal_irq_set_affini* occurred. It is this function's job to demux this irq and * figure out exactly which trigger needs servicing. */ -static void metag_internal_irq_demux (unsigned int irq,struct irq_desc *desc) +static void metag_internal_irq_demux (unsigned int __irq, +struct irq_desc *desc) {struct metag_internal_irq_priv *priv =irq_desc_get_handler_data (desc);irq_hw_number_t hw;
var/julia/linuxcopy/drivers/irqchip/irq-metag-ext.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-metag-ext.c +1 -1
@@ -447,7 +447,7 @@ static int meta_intc_irq_set_type(struct* Whilst using TR2 to detect external interrupts is a software convention it is * (hopefully) unlikely to change. */ -static void meta_intc_irq_demux (unsigned int irq,struct irq_desc *desc) +static void meta_intc_irq_demux (unsigned int __irq,struct irq_desc *desc) {struct meta_intc_priv *priv = &meta_intc_priv;irq_hw_number_t hw;
var/julia/linuxcopy/drivers/irqchip/irq-mips-gic.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-mips-gic.c +1 -1
@@ -513,7 +513,7 @@ static void __gic_irq_dispatch(void)gic_handle_shared_int (); } -static void gic_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void gic_irq_dispatch (unsigned int __irq,struct irq_desc *desc) {__gic_irq_dispatch (); }
var/julia/linuxcopy/drivers/irqchip/irq-mmp.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-mmp.c +2 -1
@@ -130,8 +130,9 @@ struct irq_chip icu_irq_chip = { .irq_unmask = icu_unmask_irq, }; -static void icu_mux_irq_demux (unsigned int irq,struct irq_desc *desc) +static void icu_mux_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_domain *domain;struct icu_chip_data *data;int i;
var/julia/linuxcopy/drivers/irqchip/irq-orion.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-orion.c +3 -1
@@ -107,8 +107,10 @@ IRQCHIP_DECLARE(orion_intc, "marvell,ori#define ORION_BRIDGE_IRQ_CAUSE 0x00#define ORION_BRIDGE_IRQ_MASK 0x04 -static void orion_bridge_irq_handler (unsigned int irq,struct irq_desc *desc) +static void orion_bridge_irq_handler (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_domain *d =irq_get_handler_data (irq);struct irq_chip_generic *gc =irq_get_domain_generic_chip (d,0 );
var/julia/linuxcopy/drivers/irqchip/irq-s3c24xx.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-s3c24xx.c +1 -1
@@ -299,7 +299,7 @@ static struct irq_chip s3c_irq_eint0t4 = .irq_set_type = s3c_irqext0_type, }; -static void s3c_irq_demux (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct s3c_irq_data *irq_data =irq_desc_get_chip_data (desc);
var/julia/linuxcopy/drivers/irqchip/irq-sunxi-nmi.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-sunxi-nmi.c +2 -1
@@ -58,8 +58,9 @@ static inline u32 sunxi_sc_nmi_read(strureturn irq_reg_readl (gc, off); } -static void sunxi_sc_nmi_handle_irq (unsigned int irq,struct irq_desc *desc) +static void sunxi_sc_nmi_handle_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_domain *domain =irq_desc_get_handler_data (desc);struct irq_chip *chip =irq_get_chip (irq);unsigned int virq =irq_find_mapping (domain,0 );
var/julia/linuxcopy/drivers/irqchip/irq-tb10x.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-tb10x.c +2 -1
@@ -97,8 +97,9 @@ static int tb10x_irq_set_type(struct irqreturn IRQ_SET_MASK_OK ; } -static void tb10x_irq_cascade (unsigned int irq,struct irq_desc *desc) +static void tb10x_irq_cascade (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_domain *domain =irq_desc_get_handler_data (desc);generic_handle_irq (irq_find_mapping (domain, irq));
var/julia/linuxcopy/drivers/irqchip/irq-versatile-fpga.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-versatile-fpga.c +2 -1
@@ -66,8 +66,9 @@ static void fpga_irq_unmask(struct irq_dwritel (mask, f->base +IRQ_ENABLE_SET ); } -static void fpga_irq_handle (unsigned int irq,struct irq_desc *desc) +static void fpga_irq_handle (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct fpga_irq_data *f =irq_desc_get_handler_data (desc);u32 status =readl (f->base +IRQ_STATUS );
var/julia/linuxcopy/drivers/irqchip/irq-vic.c renamed from var/linuxes/linux-next/drivers/irqchip/irq-vic.c +1 -1
@@ -226,7 +226,7 @@ static int handle_one_vic(struct vic_devreturn handled; } -static void vic_handle_irq_cascaded (unsigned int irq,struct irq_desc *desc) +static void vic_handle_irq_cascaded (unsigned int __irq,struct irq_desc *desc) {u32 stat, hwirq;struct irq_chip *host_chip =irq_desc_get_chip (desc);
var/julia/linuxcopy/drivers/irqchip/spear-shirq.c renamed from var/linuxes/linux-next/drivers/irqchip/spear-shirq.c +2 -1
@@ -183,8 +183,9 @@ static struct spear_shirq *spear320_shir &spear320_shirq_intrcomm_ras, }; -static void shirq_handler (unsigned irq,struct irq_desc *desc) +static void shirq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct spear_shirq *shirq =irq_get_handler_data (irq);u32 pend;
var/julia/linuxcopy/drivers/mfd/asic3.c renamed from var/linuxes/linux-next/drivers/mfd/asic3.c +1 -1
@@ -138,7 +138,7 @@ static void asic3_irq_flip_edge(struct aspin_unlock_irqrestore (&asic->lock, flags); } -static void asic3_irq_demux (unsigned int irq,struct irq_desc *desc) +static void asic3_irq_demux (unsigned int __irq,struct irq_desc *desc) {struct asic3 *asic =irq_desc_get_handler_data (desc);struct irq_data *data =irq_desc_get_irq_data (desc);
var/julia/linuxcopy/drivers/mfd/ezx-pcap.c renamed from var/linuxes/linux-next/drivers/mfd/ezx-pcap.c +2 -1
@@ -205,8 +205,9 @@ static void pcap_isr_work(struct work_st }while (gpio_get_value (pdata->gpio)); } -static void pcap_irq_handler (unsigned int irq,struct irq_desc *desc) +static void pcap_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct pcap_chip *pcap =irq_get_handler_data (irq); desc->irq_data.chip->irq_ack (&desc->irq_data);
var/julia/linuxcopy/drivers/mfd/htc-egpio.c renamed from var/linuxes/linux-next/drivers/mfd/htc-egpio.c +1 -1
@@ -98,7 +98,7 @@ static struct irq_chip egpio_muxed_chip .irq_unmask = egpio_unmask, }; -static void egpio_handler (unsigned int irq,struct irq_desc *desc) +static void egpio_handler (unsigned int __irq,struct irq_desc *desc) {struct egpio_info *ei =irq_desc_get_handler_data (desc);int irqpin;
var/julia/linuxcopy/drivers/mfd/jz4740-adc.c renamed from var/linuxes/linux-next/drivers/mfd/jz4740-adc.c +1 -1
@@ -65,7 +65,7 @@ struct jz4740_adc {spinlock_t lock; }; -static void jz4740_adc_irq_demux (unsigned int irq,struct irq_desc *desc) +static void jz4740_adc_irq_demux (unsigned int __irq,struct irq_desc *desc) {struct irq_chip_generic *gc =irq_desc_get_handler_data (desc);uint8_t status;
var/julia/linuxcopy/drivers/mfd/pm8921-core.c renamed from var/linuxes/linux-next/drivers/mfd/pm8921-core.c +1 -1
@@ -156,7 +156,7 @@ static int pm8xxx_irq_master_handler(strreturn ret; } -static void pm8xxx_irq_handler (unsigned int irq,struct irq_desc *desc) +static void pm8xxx_irq_handler (unsigned int __irq,struct irq_desc *desc) {struct pm_irq_chip *chip =irq_desc_get_handler_data (desc);struct irq_chip *irq_chip =irq_desc_get_chip (desc);
var/julia/linuxcopy/drivers/mfd/t7l66xb.c renamed from var/linuxes/linux-next/drivers/mfd/t7l66xb.c +2 -1
@@ -185,8 +185,9 @@ static struct mfd_cell t7l66xb_cells[] =/*--------------------------------------------------------------------------*/ /* Handle the T7L66XB interrupt mux */ -static void t7l66xb_irq (unsigned int irq,struct irq_desc *desc) +static void t7l66xb_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct t7l66xb *t7l66xb =irq_get_handler_data (irq);unsigned int isr;unsigned int i, irq_base;
var/julia/linuxcopy/drivers/mfd/tc6393xb.c renamed from var/linuxes/linux-next/drivers/mfd/tc6393xb.c +2 -1
@@ -523,8 +523,9 @@ static int tc6393xb_register_gpio(struct/*--------------------------------------------------------------------------*/ static void -tc6393xb_irq (unsigned int irq,struct irq_desc *desc) +tc6393xb_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct tc6393xb *tc6393xb =irq_get_handler_data (irq);unsigned int isr;unsigned int i, irq_base;
var/julia/linuxcopy/drivers/mfd/ucb1x00-core.c renamed from var/linuxes/linux-next/drivers/mfd/ucb1x00-core.c +2 -1
@@ -282,8 +282,9 @@ void ucb1x00_adc_disable(struct ucb1x00* SIBCLK to talk to the chip. We leave the clock running until * we have finished processing all interrupts from the chip. */ -static void ucb1x00_irq (unsigned int irq,struct irq_desc *desc) +static void ucb1x00_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct ucb1x00 *ucb =irq_desc_get_handler_data (desc);unsigned int isr, i;
var/julia/linuxcopy/drivers/pci/host/pci-keystone.c renamed from var/linuxes/linux-next/drivers/pci/host/pci-keystone.c +5 -2
@@ -112,8 +112,9 @@ static int ks_pcie_establish_link(structreturn 0 ; } -static void ks_pcie_msi_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ks_pcie_msi_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct keystone_pcie *ks_pcie =irq_desc_get_handler_data (desc);u32 offset = irq - ks_pcie->msi_host_irqs[0 ];struct pcie_port *pp = &ks_pcie->pp;
@@ -139,8 +140,10 @@ static void ks_pcie_msi_irq_handler(unsi* Traverse through pending legacy interrupts and invoke handler for each. Also * takes care of interrupt controller level mask/ack operation. */ -static void ks_pcie_legacy_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ks_pcie_legacy_irq_handler (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct keystone_pcie *ks_pcie =irq_desc_get_handler_data (desc);struct pcie_port *pp = &ks_pcie->pp;u32 irq_offset = irq - ks_pcie->legacy_host_irqs[0 ];
var/julia/linuxcopy/drivers/pinctrl/mediatek/pinctrl-mtk-common.c renamed from var/linuxes/linux-next/drivers/pinctrl/mediatek/pinctrl-mtk-common.c +2 -1
@@ -1116,8 +1116,9 @@ mtk_eint_debounce_process(struct mtk_pin } } -static void mtk_eint_irq_handler (unsigned irq,struct irq_desc *desc) +static void mtk_eint_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct mtk_pinctrl *pctl =irq_get_handler_data (irq);unsigned int status, eint_num;
var/julia/linuxcopy/drivers/pinctrl/pinctrl-adi2.c renamed from var/linuxes/linux-next/drivers/pinctrl/pinctrl-adi2.c +2 -2
@@ -530,8 +530,8 @@ static inline void preflow_handler(strucstatic inline void preflow_handler (struct irq_desc *desc) { }#endif -static void adi_gpio_handle_pint_irq (unsigned int inta_irq, -struct irq_desc *desc) +static void adi_gpio_handle_pint_irq (unsigned int __inta_irq, +struct irq_desc *desc) {u32 request;u32 level_mask, hwirq;
var/julia/linuxcopy/drivers/pinctrl/pinctrl-rockchip.c renamed from var/linuxes/linux-next/drivers/pinctrl/pinctrl-rockchip.c +2 -1
@@ -1394,8 +1394,9 @@ static const struct gpio_chip rockchip_g* Interrupt handling */ -static void rockchip_irq_demux (unsigned int irq,struct irq_desc *desc) +static void rockchip_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct rockchip_pin_bank *bank =irq_get_handler_data (irq);u32 pend;
var/julia/linuxcopy/drivers/pinctrl/pinctrl-single.c renamed from var/linuxes/linux-next/drivers/pinctrl/pinctrl-single.c +2 -1
@@ -1679,8 +1679,9 @@ static irqreturn_t pcs_irq_handler(int i* Use this if you have a separate interrupt for each * pinctrl-single instance. */ -static void pcs_irq_chain_handler (unsigned int irq,struct irq_desc *desc) +static void pcs_irq_chain_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct pcs_soc_data *pcs_soc =irq_desc_get_handler_data (desc);struct irq_chip *chip;
var/julia/linuxcopy/drivers/pinctrl/pinctrl-st.c renamed from var/linuxes/linux-next/drivers/pinctrl/pinctrl-st.c +2 -1
@@ -1472,8 +1472,9 @@ static void st_gpio_irq_handler(unsignedchained_irq_exit (chip, desc); } -static void st_gpio_irqmux_handler (unsigned irq,struct irq_desc *desc) +static void st_gpio_irqmux_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct st_pinctrl *info =irq_get_handler_data (irq);unsigned long status;
var/julia/linuxcopy/drivers/pinctrl/samsung/pinctrl-exynos.c renamed from var/linuxes/linux-next/drivers/pinctrl/samsung/pinctrl-exynos.c +5 -2
@@ -420,8 +420,9 @@ static const struct of_device_id exynos_ };/* interrupt handler for wakeup interrupts 0..15 */ -static void exynos_irq_eint0_15 (unsigned int irq,struct irq_desc *desc) +static void exynos_irq_eint0_15 (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct exynos_weint_data *eintd =irq_get_handler_data (irq);struct samsung_pin_bank *bank = eintd->bank;struct irq_chip *chip =irq_get_chip (irq);
@@ -452,8 +453,10 @@ static inline void exynos_irq_demux_eint }/* interrupt handler for wakeup interrupt 16 */ -static void exynos_irq_demux_eint16_31 (unsigned int irq,struct irq_desc *desc) +static void exynos_irq_demux_eint16_31 (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct exynos_muxed_weint_data *eintd =irq_get_handler_data (irq);struct samsung_pinctrl_drv_data *d = eintd->banks[0 ]->drvdata;
var/julia/linuxcopy/drivers/pinctrl/samsung/pinctrl-s3c64xx.c renamed from var/linuxes/linux-next/drivers/pinctrl/samsung/pinctrl-s3c64xx.c +2 -1
@@ -408,8 +408,9 @@ static const struct irq_domain_ops s3c64 .xlate = irq_domain_xlate_twocell, }; -static void s3c64xx_eint_gpio_irq (unsigned int irq,struct irq_desc *desc) +static void s3c64xx_eint_gpio_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct s3c64xx_eint_gpio_data *data =irq_get_handler_data (irq);struct samsung_pinctrl_drv_data *drvdata = data->drvdata;
var/julia/linuxcopy/drivers/pinctrl/sunxi/pinctrl-sunxi.c renamed from var/linuxes/linux-next/drivers/pinctrl/sunxi/pinctrl-sunxi.c +2 -1
@@ -709,8 +709,9 @@ static struct irq_chip sunxi_pinctrl_lev IRQCHIP_EOI_IF_HANDLED, }; -static void sunxi_pinctrl_irq_handler (unsigned irq,struct irq_desc *desc) +static void sunxi_pinctrl_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct sunxi_pinctrl *pctl =irq_get_handler_data (irq);unsigned long bank, reg, val;
var/julia/linuxcopy/drivers/sh/intc/core.c renamed from var/linuxes/linux-next/drivers/sh/intc/core.c +2 -1
@@ -65,8 +65,9 @@ void intc_set_prio_level(unsigned int irraw_spin_unlock_irqrestore (&intc_big_lock, flags); } -static void intc_redirect_irq (unsigned int irq,struct irq_desc *desc) +static void intc_redirect_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);generic_handle_irq ((unsigned int )irq_get_handler_data (irq)); }
var/julia/linuxcopy/drivers/sh/intc/virq.c renamed from var/linuxes/linux-next/drivers/sh/intc/virq.c +2 -1
@@ -107,8 +107,9 @@ static int add_virq_to_pirq(unsigned intreturn 0 ; } -static void intc_virq_handler (unsigned int irq,struct irq_desc *desc) +static void intc_virq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_data *data =irq_get_irq_data (irq);struct irq_chip *chip =irq_data_get_irq_chip (data);struct intc_virq_list *entry, *vlist =irq_data_get_irq_handler_data (data);
var/julia/linuxcopy/drivers/spmi/spmi-pmic-arb.c renamed from var/linuxes/linux-next/drivers/spmi/spmi-pmic-arb.c +2 -1
@@ -451,8 +451,9 @@ static void periph_interrupt(struct spmi } } -static void pmic_arb_chained_irq (unsigned int irq,struct irq_desc *desc) +static void pmic_arb_chained_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct spmi_pmic_arb_dev *pa =irq_get_handler_data (irq);struct irq_chip *chip =irq_get_chip (irq);void __iomem *intr = pa->intr;
var/julia/linuxcopy/kernel/irq/chip.c renamed from var/linuxes/linux-next/kernel/irq/chip.c +14 -7
@@ -383,8 +383,9 @@ static bool irq_may_run(struct irq_desc* unmask issues if necessary. */ void -handle_simple_irq (unsigned int irq,struct irq_desc *desc) +handle_simple_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);raw_spin_lock (&desc->lock);if (!irq_may_run (desc))
@@ -434,8 +435,9 @@ static void cond_unmask_irq(struct irq_d* interrupt line is back to inactive. */ void -handle_level_irq (unsigned int irq,struct irq_desc *desc) +handle_level_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);raw_spin_lock (&desc->lock);mask_ack_irq (desc);
@@ -505,8 +507,9 @@ static void cond_unmask_eoi_irq(struct i* details in hardware, transparently. */ void -handle_fasteoi_irq (unsigned int irq,struct irq_desc *desc) +handle_fasteoi_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip = desc->irq_data.chip;raw_spin_lock (&desc->lock);
@@ -561,8 +564,9 @@ EXPORT_SYMBOL_GPL(handle_fasteoi_irq);* loop is left. */ void -handle_edge_irq (unsigned int irq,struct irq_desc *desc) +handle_edge_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);raw_spin_lock (&desc->lock); desc->istate &= ~(IRQS_REPLAY |IRQS_WAITING );
@@ -624,8 +628,9 @@ EXPORT_SYMBOL(handle_edge_irq);* Similar as the above handle_edge_irq, but using eoi and w/o the * mask/unmask logic. */ -void handle_edge_eoi_irq (unsigned int irq,struct irq_desc *desc) +void handle_edge_eoi_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_desc_get_chip (desc);raw_spin_lock (&desc->lock);
@@ -671,8 +676,9 @@ out_eoi:* Per CPU interrupts on SMP machines without locking requirements */ void -handle_percpu_irq (unsigned int irq,struct irq_desc *desc) +handle_percpu_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_desc_get_chip (desc);kstat_incr_irqs_this_cpu (irq, desc);
@@ -698,8 +704,9 @@ handle_percpu_irq(unsigned int irq, stru* contain the real device id for the cpu on which this handler is * called */ -void handle_percpu_devid_irq (unsigned int irq,struct irq_desc *desc) +void handle_percpu_devid_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_desc_get_chip (desc);struct irqaction *action = desc->action;void *dev_id =raw_cpu_ptr (action->percpu_dev_id);
var/julia/linuxcopy/kernel/irq/handle.c renamed from var/linuxes/linux-next/kernel/irq/handle.c +2 -1
@@ -27,8 +27,9 @@* * Handles spurious and unhandled IRQ's. It also prints a debugmessage. */ -void handle_bad_irq (unsigned int irq,struct irq_desc *desc) +void handle_bad_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);print_irq_desc (irq, desc);kstat_incr_irqs_this_cpu (irq, desc);ack_bad_irq (irq);
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Better formatted diff.
julia
arch/arm/common/locomo.c +2 -1
@@ -138,8 +138,9 @@ static struct locomo_dev_info locomo_devices[] = { }, }; -static void locomo_handler (unsigned int irq,struct irq_desc *desc) +static void locomo_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct locomo *lchip =irq_get_chip_data (irq);int req, i;
arch/arm/common/sa1111.c +2 -1
@@ -197,8 +197,9 @@ static struct sa1111_dev_info sa1111_devices[] = {* will call us again if there are more interrupts to process. */ static void -sa1111_irq_handler (unsigned int irq,struct irq_desc *desc) +sa1111_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);unsigned int stat0, stat1, i;struct sa1111 *sachip =irq_get_handler_data (irq);void __iomem *mapbase = sachip->base +SA1111_INTC ;
arch/arm/mach-dove/irq.c +2 -1
@@ -69,8 +69,9 @@ static struct irq_chip pmu_irq_chip = { .irq_ack = pmu_irq_ack, }; -static void pmu_irq_handler (unsigned int irq,struct irq_desc *desc) +static void pmu_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);unsigned long cause =readl (PMU_INTERRUPT_CAUSE ); cause &=readl (PMU_INTERRUPT_MASK );
arch/arm/mach-footbridge/isa-irq.c +1 -1
@@ -88,7 +88,7 @@ static struct irq_chip isa_hi_chip = { };static void -isa_irq_handler (unsigned int irq,struct irq_desc *desc) +isa_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned int isa_irq = *(unsigned char *)PCIIACK_BASE ;
arch/arm/mach-gemini/gpio.c +1 -1
@@ -126,7 +126,7 @@ static int gpio_set_irq_type(struct irq_data *d, unsigned int type)return 0 ; } -static void gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void gpio_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned int port = (unsigned int )irq_desc_get_handler_data (desc);unsigned int gpio_irq_no, irq_stat;
arch/arm/mach-imx/3ds_debugboard.c +1 -1
@@ -85,7 +85,7 @@ static struct platform_device smsc_lan9217_device = { .resource = smsc911x_resources, }; -static void mxc_expio_irq_handler (u32 irq,struct irq_desc *desc) +static void mxc_expio_irq_handler (u32 __irq,struct irq_desc *desc) {u32 imr_val;u32 int_valid;
arch/arm/mach-imx/mach-mx31ads.c +1 -1
@@ -154,7 +154,7 @@ static inline void mxc_init_imx_uart(void)imx31_add_imx_uart0 (&uart_pdata); } -static void mx31ads_expio_irq_handler (u32 irq,struct irq_desc *desc) +static void mx31ads_expio_irq_handler (u32 __irq,struct irq_desc *desc) {u32 imr_val;u32 int_valid;
arch/arm/mach-iop13xx/msi.c +1 -1
@@ -91,7 +91,7 @@ static void (*write_imipr[])(u32) = { write_imipr_3, }; -static void iop13xx_msi_handler (unsigned int irq,struct irq_desc *desc) +static void iop13xx_msi_handler (unsigned int __irq,struct irq_desc *desc) {int i, j;unsigned long status;
arch/arm/mach-lpc32xx/irq.c +2 -2
@@ -370,7 +370,7 @@ static struct irq_chip lpc32xx_irq_chip = { .irq_set_wake = lpc32xx_irq_wake }; -static void lpc32xx_sic1_handler (unsigned int irq,struct irq_desc *desc) +static void lpc32xx_sic1_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long ints =__raw_readl (LPC32XX_INTC_STAT (LPC32XX_SIC1_BASE ));
@@ -383,7 +383,7 @@ static void lpc32xx_sic1_handler(unsigned int irq, struct irq_desc *desc) } } -static void lpc32xx_sic2_handler (unsigned int irq,struct irq_desc *desc) +static void lpc32xx_sic2_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long ints =__raw_readl (LPC32XX_INTC_STAT (LPC32XX_SIC2_BASE ));
arch/arm/mach-netx/generic.c +1 -1
@@ -70,7 +70,7 @@ static struct platform_device *devices[] __initdata = {#endif static void -netx_hif_demux_handler (unsigned int irq_unused,struct irq_desc *desc) +netx_hif_demux_handler (unsigned int __irq_unused,struct irq_desc *desc) {unsigned int irq =NETX_IRQ_HIF_CHAINED (0 );unsigned int stat;
arch/arm/mach-omap1/fpga.c +2 -1
@@ -87,7 +87,8 @@ static void fpga_mask_ack_irq(struct irq_data *d)fpga_ack_irq (d); } -static void innovator_fpga_IRQ_demux (unsigned int irq,struct irq_desc *desc) +static void innovator_fpga_IRQ_demux (unsigned int __irq, +struct irq_desc *desc) {u32 stat;int fpga_irq;
arch/arm/mach-omap2/prm_common.c +1 -1
@@ -102,7 +102,7 @@ static void omap_prcm_events_filter_priority(unsigned long *events,* dispatched accordingly. Clearing of the wakeup events should be * done by the SoC specific individual handlers. */ -static void omap_prcm_irq_handler (unsigned int irq,struct irq_desc *desc) +static void omap_prcm_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending[OMAP_PRCM_MAX_NR_PENDING_REG ];unsigned long priority_pending[OMAP_PRCM_MAX_NR_PENDING_REG ];
arch/arm/mach-pxa/balloon3.c +1 -1
@@ -496,7 +496,7 @@ static struct irq_chip balloon3_irq_chip = { .irq_unmask = balloon3_unmask_irq, }; -static void balloon3_irq_handler (unsigned int irq,struct irq_desc *desc) +static void balloon3_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending =__raw_readl (BALLOON3_INT_CONTROL_REG ) & balloon3_irq_enabled;
arch/arm/mach-pxa/cm-x2xx-pci.c +2 -1
@@ -29,8 +29,9 @@void __iomem *it8152_base_address;static int cmx2xx_it8152_irq_gpio; -static void cmx2xx_it8152_irq_demux (unsigned int irq,struct irq_desc *desc) +static void cmx2xx_it8152_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);/* clear our parent irq */ desc->irq_data.chip->irq_ack (&desc->irq_data);
arch/arm/mach-pxa/lpd270.c +1 -1
@@ -120,7 +120,7 @@ static struct irq_chip lpd270_irq_chip = { .irq_unmask = lpd270_unmask_irq, }; -static void lpd270_irq_handler (unsigned int irq,struct irq_desc *desc) +static void lpd270_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending;
arch/arm/mach-pxa/pcm990-baseboard.c +1 -1
@@ -284,7 +284,7 @@ static struct irq_chip pcm990_irq_chip = { .irq_unmask = pcm990_unmask_irq, }; -static void pcm990_irq_handler (unsigned int irq,struct irq_desc *desc) +static void pcm990_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending;
arch/arm/mach-pxa/viper.c +1 -1
@@ -276,7 +276,7 @@ static inline unsigned long viper_irq_pending(void) viper_irq_enabled_mask; } -static void viper_irq_handler (unsigned int irq,struct irq_desc *desc) +static void viper_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending;
arch/arm/mach-pxa/zeus.c +1 -1
@@ -105,7 +105,7 @@ static inline unsigned long zeus_irq_pending(void)return __raw_readw (ZEUS_CPLD_ISA_IRQ ) & zeus_irq_enabled_mask; } -static void zeus_irq_handler (unsigned int irq,struct irq_desc *desc) +static void zeus_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long pending;
arch/arm/mach-rpc/ecard.c +1 -1
@@ -552,7 +552,7 @@ static void ecard_check_lockup(struct irq_desc *desc) }static void -ecard_irq_handler (unsigned int irq,struct irq_desc *desc) +ecard_irq_handler (unsigned int __irq,struct irq_desc *desc) {ecard_t *ec;int called =0 ;
arch/arm/mach-s3c24xx/bast-irq.c +1 -1
@@ -101,7 +101,7 @@ static struct irq_chip bast_pc104_chip = { };static void -bast_irq_pc104_demux (unsigned int irq, +bast_irq_pc104_demux (unsigned int __irq,struct irq_desc *desc) {unsigned int stat;
arch/arm/mach-s3c64xx/common.c +4 -4
@@ -389,22 +389,22 @@ static inline void s3c_irq_demux_eint(unsigned int start, unsigned int end) } } -static void s3c_irq_demux_eint0_3 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint0_3 (unsigned int __irq,struct irq_desc *desc) {s3c_irq_demux_eint (0 ,3 ); } -static void s3c_irq_demux_eint4_11 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint4_11 (unsigned int __irq,struct irq_desc *desc) {s3c_irq_demux_eint (4 ,11 ); } -static void s3c_irq_demux_eint12_19 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint12_19 (unsigned int __irq,struct irq_desc *desc) {s3c_irq_demux_eint (12 ,19 ); } -static void s3c_irq_demux_eint20_27 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint20_27 (unsigned int __irq,struct irq_desc *desc) {s3c_irq_demux_eint (20 ,27 ); }
arch/arm/mach-sa1100/neponset.c +1 -1
@@ -166,7 +166,7 @@ static struct sa1100_port_fns neponset_port_fns = {* ensure that the IRQ signal is deasserted before returning. This * is rather unfortunate. */ -static void neponset_irq_handler (unsigned int irq,struct irq_desc *desc) +static void neponset_irq_handler (unsigned int __irq,struct irq_desc *desc) {struct neponset_drvdata *d =irq_desc_get_handler_data (desc);unsigned int irr;
arch/arm/plat-orion/gpio.c +2 -1
@@ -407,8 +407,9 @@ static int gpio_irq_set_type(struct irq_data *d, u32 type)return 0 ; } -static void gpio_irq_handler (unsigned irq,struct irq_desc *desc) +static void gpio_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct orion_gpio_chip *ochip =irq_get_handler_data (irq);u32 cause, type;int i;
arch/avr32/mach-at32ap/extint.c +1 -1
@@ -144,7 +144,7 @@ static struct irq_chip eic_chip = { .irq_set_type = eic_set_irq_type, }; -static void demux_eic_irq (unsigned int irq,struct irq_desc *desc) +static void demux_eic_irq (unsigned int __irq,struct irq_desc *desc) {struct eic *eic =irq_desc_get_handler_data (desc);unsigned long status, pending;
arch/avr32/mach-at32ap/pio.c +2 -1
@@ -281,8 +281,9 @@ static struct irq_chip gpio_irqchip = { .irq_set_type = gpio_irq_type, }; -static void gpio_irq_handler (unsigned irq,struct irq_desc *desc) +static void gpio_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct pio_device *pio =irq_desc_get_chip_data (desc);unsigned gpio_irq;
arch/blackfin/mach-bf537/ints-priority.c +3 -2
@@ -89,7 +89,7 @@ static struct irq_chip bf537_generic_error_irqchip = { .irq_unmask = bf537_generic_error_unmask_irq, }; -static void bf537_demux_error_irq (unsigned int int_err_irq, +static void bf537_demux_error_irq (unsigned int __int_err_irq,struct irq_desc *inta_desc) {int irq =0 ;
@@ -182,9 +182,10 @@ static struct irq_chip bf537_mac_rx_irqchip = { .irq_unmask = bf537_mac_rx_unmask_irq, }; -static void bf537_demux_mac_rx_irq (unsigned int int_irq, +static void bf537_demux_mac_rx_irq (unsigned int __int_irq,struct irq_desc *desc) { +unsigned int int_irq =irq_desc_get_irq (desc);if (bfin_read_DMA1_IRQ_STATUS () & (DMA_DONE |DMA_ERR ))bfin_handle_irq (IRQ_MAC_RX );else
arch/blackfin/mach-common/ints-priority.c +4 -3
@@ -655,7 +655,7 @@ static struct irq_chip bfin_mac_status_irqchip = { .irq_set_wake = bfin_mac_status_set_wake, }; -void bfin_demux_mac_status_irq (unsigned int int_err_irq, +void bfin_demux_mac_status_irq (unsigned int ____int_err_irq,struct irq_desc *inta_desc) {int i, irq =0 ;
@@ -824,9 +824,10 @@ static void bfin_demux_gpio_block(unsigned int irq) } } -void bfin_demux_gpio_irq (unsigned int inta_irq, -struct irq_desc *desc) +void bfin_demux_gpio_irq (unsigned int __inta_irq, +struct irq_desc *desc) { +unsigned int inta_irq =irq_desc_get_irq (desc);unsigned int irq;switch (inta_irq) {
arch/c6x/platforms/megamod-pic.c +1 -1
@@ -93,7 +93,7 @@ static struct irq_chip megamod_chip = { .irq_unmask = unmask_megamod, }; -static void megamod_irq_cascade (unsigned int irq,struct irq_desc *desc) +static void megamod_irq_cascade (unsigned int __irq,struct irq_desc *desc) {struct megamod_cascade_data *cascade;struct megamod_pic *pic;
arch/m68k/amiga/amiints.c +4 -4
@@ -46,7 +46,7 @@ static struct irq_chip amiga_irq_chip = {* The builtin Amiga hardware interrupt handlers. */ -static void ami_int1 (unsigned int irq,struct irq_desc *desc) +static void ami_int1 (unsigned int __irq,struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
@@ -69,7 +69,7 @@ static void ami_int1(unsigned int irq, struct irq_desc *desc) } } -static void ami_int3 (unsigned int irq,struct irq_desc *desc) +static void ami_int3 (unsigned int __irq,struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
@@ -92,7 +92,7 @@ static void ami_int3(unsigned int irq, struct irq_desc *desc) } } -static void ami_int4 (unsigned int irq,struct irq_desc *desc) +static void ami_int4 (unsigned int __irq,struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
@@ -121,7 +121,7 @@ static void ami_int4(unsigned int irq, struct irq_desc *desc) } } -static void ami_int5 (unsigned int irq,struct irq_desc *desc) +static void ami_int5 (unsigned int __irq,struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
arch/m68k/coldfire/intc-5272.c +2 -1
@@ -143,8 +143,9 @@ static int intc_irq_set_type(struct irq_data *d, unsigned int type)* We need to be careful with the masking/acking due to the side effects * of masking an interrupt. */ -static void intc_external_irq (unsigned int irq,struct irq_desc *desc) +static void intc_external_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);irq_desc_get_chip (desc)->irq_ack (&desc->irq_data);handle_simple_irq (irq, desc); }
arch/m68k/mac/baboon.c +1 -1
@@ -45,7 +45,7 @@ void __init baboon_init(void)* Baboon interrupt handler. This works a lot like a VIA. */ -static void baboon_irq (unsigned int irq,struct irq_desc *desc) +static void baboon_irq (unsigned int __irq,struct irq_desc *desc) {int irq_bit, irq_num;unsigned char events;
arch/m68k/mac/oss.c +3 -2
@@ -63,8 +63,9 @@ void __init oss_nubus_init(void)* Handle miscellaneous OSS interrupts. */ -static void oss_irq (unsigned int irq,struct irq_desc *desc) +static void oss_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);int events = oss->irq_pending & (OSS_IP_IOPSCC |OSS_IP_SCSI |OSS_IP_IOPISM );
@@ -97,7 +98,7 @@ static void oss_irq(unsigned int irq, struct irq_desc *desc)* Unlike the VIA/RBV this is on its own autovector interrupt level. */ -static void oss_nubus_irq (unsigned int irq,struct irq_desc *desc) +static void oss_nubus_irq (unsigned int __irq,struct irq_desc *desc) {int events, irq_bit, i;
arch/m68k/mac/psc.c +2 -1
@@ -113,8 +113,9 @@ void __init psc_init(void)* PSC interrupt handler. It's a lot like the VIA interrupt handler. */ -static void psc_irq (unsigned int irq,struct irq_desc *desc) +static void psc_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);unsigned int offset = (unsigned int )irq_desc_get_handler_data (desc);int pIFR = pIFRbase + offset;int pIER = pIERbase + offset;
arch/m68k/mac/via.c +3 -3
@@ -446,7 +446,7 @@ void via_nubus_irq_shutdown(int irq)* via6522.c :-), disable/pending masks added. */ -void via1_irq (unsigned int irq,struct irq_desc *desc) +void via1_irq (unsigned int ____irq,struct irq_desc *desc) {int irq_num;unsigned char irq_bit, events;
@@ -467,7 +467,7 @@ void via1_irq(unsigned int irq, struct irq_desc *desc) }while (events >= irq_bit); } -static void via2_irq (unsigned int irq,struct irq_desc *desc) +static void via2_irq (unsigned int __irq,struct irq_desc *desc) {int irq_num;unsigned char irq_bit, events;
@@ -493,7 +493,7 @@ static void via2_irq(unsigned int irq, struct irq_desc *desc)* VIA2 dispatcher as a fast interrupt handler. */ -void via_nubus_irq (unsigned int irq,struct irq_desc *desc) +void via_nubus_irq (unsigned int __irq,struct irq_desc *desc) {int slot_irq;unsigned char slot_bit, events;
arch/mips/alchemy/common/irq.c +1 -1
@@ -865,7 +865,7 @@ DISP(ic0r1, AU1000_INTC0_INT_BASE, AU1000_IC0_PHYS_ADDR + IC_REQ1INT) DISP(ic1r0, AU1000_INTC1_INT_BASE, AU1000_IC1_PHYS_ADDR + IC_REQ0INT) DISP(ic1r1, AU1000_INTC1_INT_BASE, AU1000_IC1_PHYS_ADDR + IC_REQ1INT) -static void alchemy_gpic_dispatch (unsigned int irq,struct irq_desc *d) +static void alchemy_gpic_dispatch (unsigned int __irq,struct irq_desc *d) {int i =__raw_readl (AU1300_GPIC_ADDR +AU1300_GPIC_PRIENC );generic_handle_irq (ALCHEMY_GPIC_INT_BASE + i);
arch/mips/alchemy/devboards/bcsr.c +2 -1
@@ -85,8 +85,9 @@ EXPORT_SYMBOL_GPL(bcsr_mod);/* * DB1200/PB1200 CPLD IRQ muxer */ -static void bcsr_csc_handler (unsigned int irq,struct irq_desc *d) +static void bcsr_csc_handler (unsigned int __irq,struct irq_desc *d) { +unsigned int irq =irq_desc_get_irq (d);unsigned short bisr =__raw_readw (bcsr_virt +BCSR_REG_INTSTAT );disable_irq_nosync (irq);
arch/mips/ath25/ar2315.c +1 -1
@@ -69,7 +69,7 @@ static struct irqaction ar2315_ahb_err_interrupt = { .name = "ar2315-ahb-error", }; -static void ar2315_misc_irq_handler (unsigned irq,struct irq_desc *desc) +static void ar2315_misc_irq_handler (unsigned __irq,struct irq_desc *desc) {u32 pending =ar2315_rst_reg_read (AR2315_ISR ) &ar2315_rst_reg_read (AR2315_IMR );
arch/mips/ath25/ar5312.c +1 -1
@@ -73,7 +73,7 @@ static struct irqaction ar5312_ahb_err_interrupt = { .name = "ar5312-ahb-error", }; -static void ar5312_misc_irq_handler (unsigned irq,struct irq_desc *desc) +static void ar5312_misc_irq_handler (unsigned __irq,struct irq_desc *desc) {u32 pending =ar5312_rst_reg_read (AR5312_ISR ) &ar5312_rst_reg_read (AR5312_IMR );
arch/mips/ath79/irq.c +9 -4
@@ -27,7 +27,7 @@#include "common.h" #include "machtypes.h" -static void ath79_misc_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ath79_misc_irq_handler (unsigned int __irq,struct irq_desc *desc) {void __iomem *base = ath79_reset_base;u32 pending;
@@ -120,8 +120,9 @@ static void __init ath79_misc_irq_init(void)irq_set_chained_handler (ATH79_CPU_IRQ (6 ), ath79_misc_irq_handler); } -static void ar934x_ip2_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void ar934x_ip2_irq_dispatch (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);u32 status;disable_irq_nosync (irq);
@@ -153,8 +154,10 @@ static void ar934x_ip2_irq_init(void)irq_set_chained_handler (ATH79_CPU_IRQ (2 ), ar934x_ip2_irq_dispatch); } -static void qca955x_ip2_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void qca955x_ip2_irq_dispatch (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);u32 status;disable_irq_nosync (irq);
@@ -181,8 +184,10 @@ enable:enable_irq (irq); } -static void qca955x_ip3_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void qca955x_ip3_irq_dispatch (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);u32 status;disable_irq_nosync (irq);
arch/mips/jz4740/gpio.c +2 -1
@@ -296,7 +296,8 @@ static void jz_gpio_check_trigger_both(struct jz_gpio_chip *chip, unsigned int iwritel (mask, reg); } -static void jz_gpio_irq_demux_handler (unsigned int irq,struct irq_desc *desc) +static void jz_gpio_irq_demux_handler (unsigned int __irq, +struct irq_desc *desc) {uint32_t flag;unsigned int gpio_irq;
arch/mips/kernel/i8259.c +2 -1
@@ -353,8 +353,9 @@ void __init init_i8259_irqs(void)__init_i8259_irqs (NULL ); } -static void i8259_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void i8259_irq_dispatch (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_domain *domain =irq_get_handler_data (irq);int hwirq =i8259_irq ();
arch/mips/netlogic/common/smp.c +4 -2
@@ -82,8 +82,9 @@ void nlm_send_ipi_mask(const struct cpumask *mask, unsigned int action) }/* IRQ_IPI_SMP_FUNCTION Handler */ -void nlm_smp_function_ipi_handler (unsigned int irq,struct irq_desc *desc) +void nlm_smp_function_ipi_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);clear_c0_eimr (irq);ack_c0_eirr (irq);smp_call_function_interrupt ();
@@ -91,8 +92,9 @@ void nlm_smp_function_ipi_handler(unsigned int irq, struct irq_desc *desc) }/* IRQ_IPI_SMP_RESCHEDULE handler */ -void nlm_smp_resched_ipi_handler (unsigned int irq,struct irq_desc *desc) +void nlm_smp_resched_ipi_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);clear_c0_eimr (irq);ack_c0_eirr (irq);scheduler_ipi ();
arch/mips/pci/pci-ar2315.c +1 -1
@@ -318,7 +318,7 @@ static int ar2315_pci_host_setup(struct ar2315_pci_ctrl *apc)return 0 ; } -static void ar2315_pci_irq_handler (unsigned irq,struct irq_desc *desc) +static void ar2315_pci_irq_handler (unsigned __irq,struct irq_desc *desc) {struct ar2315_pci_ctrl *apc =irq_desc_get_handler_data (desc); u32 pending = ar2315_pci_reg_read(apc, AR2315_PCI_ISR) &
arch/mips/pci/pci-ar71xx.c +1 -1
@@ -226,7 +226,7 @@ static struct pci_ops ar71xx_pci_ops = { .write = ar71xx_pci_write_config, }; -static void ar71xx_pci_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ar71xx_pci_irq_handler (unsigned int __irq,struct irq_desc *desc) {struct ar71xx_pci_controller *apc;void __iomem *base = ath79_reset_base;
arch/mips/pci/pci-ar724x.c +1 -1
@@ -225,7 +225,7 @@ static struct pci_ops ar724x_pci_ops = { .write = ar724x_pci_write, }; -static void ar724x_pci_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ar724x_pci_irq_handler (unsigned int __irq,struct irq_desc *desc) {struct ar724x_pci_controller *apc;void __iomem *base;
arch/mips/pci/pci-rt3883.c +1 -1
@@ -129,7 +129,7 @@ static void rt3883_pci_write_cfg32(struct rt3883_pci_controller *rpc,rt3883_pci_w32 (rpc, val,RT3883_PCI_REG_CFGDATA ); } -static void rt3883_pci_irq_handler (unsigned int irq,struct irq_desc *desc) +static void rt3883_pci_irq_handler (unsigned int __irq,struct irq_desc *desc) {struct rt3883_pci_controller *rpc;u32 pending;
arch/mips/ralink/irq.c +1 -1
@@ -95,7 +95,7 @@ unsigned int get_c0_compare_int(void)return CP0_LEGACY_COMPARE_IRQ ; } -static void ralink_intc_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ralink_intc_irq_handler (unsigned int __irq,struct irq_desc *desc) {u32 pending =rt_intc_r32 (INTC_REG_STATUS0 );
arch/powerpc/platforms/512x/mpc5121_ads_cpld.c +1 -1
@@ -105,7 +105,7 @@ cpld_pic_get_irq(int offset, u8 ignore, u8 __iomem *statusp, }static void -cpld_pic_cascade (unsigned int irq,struct irq_desc *desc) +cpld_pic_cascade (unsigned int __irq,struct irq_desc *desc) { irq =cpld_pic_get_irq (0 ,PCI_IGNORE , &cpld_regs->pci_status, &cpld_regs->pci_mask);
arch/powerpc/platforms/52xx/media5200.c +1 -1
@@ -80,7 +80,7 @@ static struct irq_chip media5200_irq_chip = { .irq_mask_ack = media5200_irq_mask, }; -void media5200_irq_cascade (unsigned int virq,struct irq_desc *desc) +void media5200_irq_cascade (unsigned int __virq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);int sub_virq, val;
arch/powerpc/platforms/52xx/mpc52xx_gpt.c +1 -1
@@ -191,7 +191,7 @@ static struct irq_chip mpc52xx_gpt_irq_chip = { .irq_set_type = mpc52xx_gpt_irq_set_type, }; -void mpc52xx_gpt_irq_cascade (unsigned int virq,struct irq_desc *desc) +void mpc52xx_gpt_irq_cascade (unsigned int __virq,struct irq_desc *desc) {struct mpc52xx_gpt_priv *gpt =irq_desc_get_handler_data (desc);int sub_virq;
arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +1 -1
@@ -78,7 +78,7 @@ static struct irq_chip pq2ads_pci_ic = { .irq_disable = pq2ads_pci_mask_irq }; -static void pq2ads_pci_irq_demux (unsigned int irq,struct irq_desc *desc) +static void pq2ads_pci_irq_demux (unsigned int __irq,struct irq_desc *desc) {struct pq2ads_pci_pic *priv =irq_desc_get_handler_data (desc);u32 stat, mask, pend;
arch/powerpc/platforms/85xx/common.c +1 -1
@@ -49,7 +49,7 @@ int __init mpc85xx_common_publish_devices(void)return of_platform_bus_probe (NULL , mpc85xx_common_ids,NULL ); }#ifdef CONFIG_CPM2 -static void cpm2_cascade (unsigned int irq,struct irq_desc *desc) +static void cpm2_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);int cascade_irq;
arch/powerpc/platforms/85xx/mpc85xx_cds.c +2 -1
@@ -192,9 +192,10 @@ void mpc85xx_cds_fixup_bus(struct pci_bus *bus) }#ifdef CONFIG_PPC_I8259 -static void mpc85xx_8259_cascade_handler (unsigned int irq, +static void mpc85xx_8259_cascade_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);unsigned int cascade_irq =i8259_irq ();if (cascade_irq !=NO_IRQ )
arch/powerpc/platforms/85xx/mpc85xx_ds.c +1 -1
@@ -46,7 +46,7 @@#endif #ifdef CONFIG_PPC_I8259 -static void mpc85xx_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void mpc85xx_8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
arch/powerpc/platforms/85xx/socrates_fpga_pic.c +2 -1
@@ -91,8 +91,9 @@ static inline unsigned int socrates_fpga_pic_get_irq(unsigned int irq) (irq_hw_number_t)i); } -void socrates_fpga_pic_cascade (unsigned int irq,struct irq_desc *desc) +void socrates_fpga_pic_cascade (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq;
arch/powerpc/platforms/86xx/pic.c +1 -1
@@ -17,7 +17,7 @@#include <asm/i8259.h> #ifdef CONFIG_PPC_I8259 -static void mpc86xx_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void mpc86xx_8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
arch/powerpc/platforms/8xx/m8xx_setup.c +1 -1
@@ -214,7 +214,7 @@ void mpc8xx_restart(char *cmd)panic ("Restart failed\n" ); } -static void cpm_cascade (unsigned int irq,struct irq_desc *desc) +static void cpm_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);int cascade_irq =cpm_get_irq ();
arch/powerpc/platforms/cell/axon_msi.c +1 -1
@@ -93,7 +93,7 @@ static void msic_dcr_write(struct axon_msic *msic, unsigned int dcr_n, u32 val)dcr_write (msic->dcr_host, dcr_n, val); } -static void axon_msi_cascade (unsigned int irq,struct irq_desc *desc) +static void axon_msi_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct axon_msic *msic =irq_desc_get_handler_data (desc);
arch/powerpc/platforms/cell/interrupt.c +2 -1
@@ -99,8 +99,9 @@ static void iic_ioexc_eoi(struct irq_data *d) { } -static void iic_ioexc_cascade (unsigned int irq,struct irq_desc *desc) +static void iic_ioexc_cascade (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_desc_get_chip (desc);struct cbe_iic_regs __iomem *node_iic = (void __iomem *)irq_desc_get_handler_data (desc);
arch/powerpc/platforms/cell/spider-pic.c +1 -1
@@ -199,7 +199,7 @@ static const struct irq_domain_ops spider_host_ops = { .xlate = spider_host_xlate, }; -static void spider_irq_cascade (unsigned int irq,struct irq_desc *desc) +static void spider_irq_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct spider_pic *pic =irq_desc_get_handler_data (desc);
arch/powerpc/platforms/chrp/setup.c +1 -1
@@ -363,7 +363,7 @@ void __init chrp_setup_arch(void)if (ppc_md.progress) ppc_md.progress ("Linux/PPC " UTS_RELEASE "\n" ,0x0 ); } -static void chrp_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void chrp_8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
arch/powerpc/platforms/embedded6xx/hlwd-pic.c +1 -1
@@ -120,7 +120,7 @@ static unsigned int __hlwd_pic_get_irq(struct irq_domain *h)return irq_linear_revmap (h, irq); } -static void hlwd_pic_irq_cascade (unsigned int cascade_virq, +static void hlwd_pic_irq_cascade (unsigned int __cascade_virq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);
arch/powerpc/platforms/embedded6xx/mvme5100.c +1 -1
@@ -42,7 +42,7 @@static phys_addr_t pci_membase;static u_char *restart; -static void mvme5100_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void mvme5100_8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
arch/powerpc/platforms/pseries/setup.c +1 -1
@@ -111,7 +111,7 @@ static void __init fwnmi_init(void) fwnmi_active =1 ; } -static void pseries_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void pseries_8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
arch/powerpc/sysdev/ge/ge_pic.c +1 -1
@@ -91,7 +91,7 @@ static int gef_pic_cascade_irq;* should be masked out. */ -void gef_pic_cascade (unsigned int irq,struct irq_desc *desc) +void gef_pic_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq;
arch/powerpc/sysdev/tsi108_pci.c +1 -1
@@ -428,7 +428,7 @@ void __init tsi108_pci_int_init(struct device_node *node)init_pci_source (); } -void tsi108_irq_cascade (unsigned int irq,struct irq_desc *desc) +void tsi108_irq_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =get_pci_source ();
arch/powerpc/sysdev/uic.c +1 -1
@@ -194,7 +194,7 @@ static const struct irq_domain_ops uic_host_ops = { .xlate = irq_domain_xlate_twocell, }; -void uic_irq_cascade (unsigned int virq,struct irq_desc *desc) +void uic_irq_cascade (unsigned int __virq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct irq_data *idata =irq_desc_get_irq_data (desc);
arch/powerpc/sysdev/xilinx_intc.c +1 -1
@@ -222,7 +222,7 @@ int xilinx_intc_get_irq(void)/* * Support code for cascading to 8259 interrupt controllers */ -static void xilinx_i8259_cascade (unsigned int irq,struct irq_desc *desc) +static void xilinx_i8259_cascade (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
arch/sh/boards/mach-se/7343/irq.c +2 -1
@@ -29,8 +29,9 @@static void __iomem *se7343_irq_regs;struct irq_domain *se7343_irq_domain; -static void se7343_irq_demux (unsigned int irq,struct irq_desc *desc) +static void se7343_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_data *data =irq_get_irq_data (irq);struct irq_chip *chip =irq_data_get_irq_chip (data);unsigned long mask;
arch/sh/boards/mach-se/7722/irq.c +2 -1
@@ -28,8 +28,9 @@static void __iomem *se7722_irq_regs;struct irq_domain *se7722_irq_domain; -static void se7722_irq_demux (unsigned int irq,struct irq_desc *desc) +static void se7722_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_data *data =irq_get_irq_data (irq);struct irq_chip *chip =irq_data_get_irq_chip (data);unsigned long mask;
arch/sh/boards/mach-se/7724/irq.c +2 -1
@@ -92,8 +92,9 @@ static struct irq_chip se7724_irq_chip __read_mostly = { .irq_unmask = enable_se7724_irq, }; -static void se7724_irq_demux (unsigned int irq,struct irq_desc *desc) +static void se7724_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct fpga_irq set =get_fpga_irq (irq);unsigned short intv =__raw_readw (set.sraddr);unsigned int ext_irq = set.base;
arch/sh/boards/mach-x3proto/gpio.c +3 -1
@@ -60,8 +60,10 @@ static int x3proto_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)return virq; } -static void x3proto_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void x3proto_gpio_irq_handler (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_data *data =irq_get_irq_data (irq);struct irq_chip *chip =irq_data_get_irq_chip (data);unsigned long mask;
arch/sh/cchips/hd6446x/hd64461.c +1 -1
@@ -56,7 +56,7 @@ static struct irq_chip hd64461_irq_chip = { .irq_unmask = hd64461_unmask_irq, }; -static void hd64461_irq_demux (unsigned int irq,struct irq_desc *desc) +static void hd64461_irq_demux (unsigned int __irq,struct irq_desc *desc) {unsigned short intv =__raw_readw (HD64461_NIRR );unsigned int ext_irq =HD64461_IRQBASE ;
arch/tile/kernel/pci_gx.c +2 -1
@@ -304,8 +304,9 @@ static struct irq_chip tilegx_legacy_irq_chip = {* to Linux which just calls handle_level_irq() after clearing the * MAC INTx Assert status bit associated with this interrupt. */ -static void trio_handle_level_irq (unsigned int irq,struct irq_desc *desc) +static void trio_handle_level_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct pci_controller *controller =irq_desc_get_handler_data (desc);gxio_trio_context_t *trio_context = controller->trio;uint64_t intx = (uint64_t )irq_desc_get_chip_data (desc);
arch/unicore32/kernel/irq.c +1 -1
@@ -113,7 +113,7 @@ static struct irq_chip puv3_low_gpio_chip = {* and call the handler. */ static void -puv3_gpio_handler (unsigned int irq,struct irq_desc *desc) +puv3_gpio_handler (unsigned int __irq,struct irq_desc *desc) {unsigned int mask;
arch/x86/lguest/boot.c +1 -1
@@ -1021,7 +1021,7 @@ static struct clock_event_device lguest_clockevent = {* This is the Guest timer interrupt handler (hardware interrupt 0). We just * call the clockevent infrastructure and it does whatever needs doing. */ -static void lguest_time_irq (unsigned int irq,struct irq_desc *desc) +static void lguest_time_irq (unsigned int __irq,struct irq_desc *desc) {unsigned long flags;
drivers/dma/ipu/ipu_irq.c +4 -2
@@ -266,8 +266,9 @@ int ipu_irq_unmap(unsigned int source) }/* Chained IRQ handler for IPU error interrupt */ -static void ipu_irq_err (unsigned int irq,struct irq_desc *desc) +static void ipu_irq_err (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct ipu *ipu =irq_get_handler_data (irq);u32 status;int i, line;
@@ -307,8 +308,9 @@ static void ipu_irq_err(unsigned int irq, struct irq_desc *desc) }/* Chained IRQ handler for IPU function interrupt */ -static void ipu_irq_fn (unsigned int irq,struct irq_desc *desc) +static void ipu_irq_fn (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct ipu *ipu =irq_desc_get_handler_data (desc);u32 status;int i, line;
drivers/gpio/gpio-bcm-kona.c +3 -1
@@ -433,8 +433,10 @@ static int bcm_kona_gpio_irq_set_type(struct irq_data *d, unsigned int type)return 0 ; } -static void bcm_kona_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void bcm_kona_gpio_irq_handler (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);void __iomem *reg_base;int bit, bank_id;unsigned long sta;
drivers/gpio/gpio-davinci.c +2 -1
@@ -327,8 +327,9 @@ static struct irq_chip gpio_irqchip = { };static void -gpio_irq_handler (unsigned irq,struct irq_desc *desc) +gpio_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct davinci_gpio_regs __iomem *g;u32 mask =0xffff ;struct davinci_gpio_controller *d;
drivers/gpio/gpio-dwapb.c +2 -1
@@ -147,8 +147,9 @@ static u32 dwapb_do_irq(struct dwapb_gpio *gpio)return ret; } -static void dwapb_irq_handler (u32 irq,struct irq_desc *desc) +static void dwapb_irq_handler (u32 __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct dwapb_gpio *gpio =irq_get_handler_data (irq);struct irq_chip *chip =irq_desc_get_chip (desc);
drivers/gpio/gpio-ep93xx.c +5 -2
@@ -78,7 +78,8 @@ static void ep93xx_gpio_int_debounce(unsigned int irq, bool enable) EP93XX_GPIO_REG(int_debounce_register_offset[port])); } -static void ep93xx_gpio_ab_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ep93xx_gpio_ab_irq_handler (unsigned int __irq, +struct irq_desc *desc) {unsigned char status;int i;
@@ -100,8 +101,10 @@ static void ep93xx_gpio_ab_irq_handler(unsigned int irq, struct irq_desc *desc) } } -static void ep93xx_gpio_f_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ep93xx_gpio_f_irq_handler (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);/* * map discontiguous hw irq range to continuous sw irq range: *
drivers/gpio/gpio-mpc8xxx.c +2 -1
@@ -185,7 +185,8 @@ static int mpc8xxx_gpio_to_irq(struct gpio_chip *gc, unsigned offset)return -ENXIO ; } -static void mpc8xxx_gpio_irq_cascade (unsigned int irq,struct irq_desc *desc) +static void mpc8xxx_gpio_irq_cascade (unsigned int __irq, +struct irq_desc *desc) {struct mpc8xxx_gpio_chip *mpc8xxx_gc =irq_desc_get_handler_data (desc);struct irq_chip *chip =irq_desc_get_chip (desc);
drivers/gpio/gpio-msic.c +1 -1
@@ -232,7 +232,7 @@ static struct irq_chip msic_irqchip = { .irq_bus_sync_unlock = msic_bus_sync_unlock, }; -static void msic_gpio_irq_handler (unsigned irq,struct irq_desc *desc) +static void msic_gpio_irq_handler (unsigned __irq,struct irq_desc *desc) {struct irq_data *data =irq_desc_get_irq_data (desc);struct msic_gpio *mg =irq_data_get_irq_handler_data (data);
drivers/gpio/gpio-msm-v2.c +1 -1
@@ -313,7 +313,7 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int flow_type)* which have been set as summary IRQ lines and which are triggered, * and to call their interrupt handlers. */ -static void msm_summary_irq_handler (unsigned int irq,struct irq_desc *desc) +static void msm_summary_irq_handler (unsigned int __irq,struct irq_desc *desc) {unsigned long i;struct irq_chip *chip =irq_desc_get_chip (desc);
drivers/gpio/gpio-mvebu.c +2 -1
@@ -458,8 +458,9 @@ static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type)return 0 ; } -static void mvebu_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void mvebu_gpio_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct mvebu_gpio_chip *mvchip =irq_get_handler_data (irq);struct irq_chip *chip =irq_desc_get_chip (desc);u32 cause, type;
drivers/gpio/gpio-mxc.c +4 -2
@@ -272,8 +272,9 @@ static void mxc_gpio_irq_handler(struct mxc_gpio_port *port, u32 irq_stat) }/* MX1 and MX3 has one interrupt *per* gpio port */ -static void mx3_gpio_irq_handler (u32 irq,struct irq_desc *desc) +static void mx3_gpio_irq_handler (u32 __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);u32 irq_stat;struct mxc_gpio_port *port =irq_get_handler_data (irq);struct irq_chip *chip =irq_get_chip (irq);
@@ -288,8 +289,9 @@ static void mx3_gpio_irq_handler(u32 irq, struct irq_desc *desc) }/* MX2 has one interrupt *for all* gpio ports */ -static void mx2_gpio_irq_handler (u32 irq,struct irq_desc *desc) +static void mx2_gpio_irq_handler (u32 __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);u32 irq_msk, irq_stat;struct mxc_gpio_port *port;struct irq_chip *chip =irq_get_chip (irq);
drivers/gpio/gpio-mxs.c +2 -1
@@ -154,8 +154,9 @@ static void mxs_flip_edge(struct mxs_gpio_port *port, u32 gpio) }/* MXS has one interrupt *per* gpio port */ -static void mxs_gpio_irq_handler (u32 irq,struct irq_desc *desc) +static void mxs_gpio_irq_handler (u32 __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);u32 irq_stat;struct mxs_gpio_port *port =irq_get_handler_data (irq);
drivers/gpio/gpio-pxa.c +1 -1
@@ -401,7 +401,7 @@ static int pxa_gpio_irq_type(struct irq_data *d, unsigned int type)return 0 ; } -static void pxa_gpio_demux_handler (unsigned int irq,struct irq_desc *desc) +static void pxa_gpio_demux_handler (unsigned int __irq,struct irq_desc *desc) {struct pxa_gpio_chip *c;int loop, gpio, gpio_base, n;
drivers/gpio/gpio-sa1100.c +1 -1
@@ -173,7 +173,7 @@ static struct irq_domain *sa1100_gpio_irqdomain;* and call the handler. */ static void -sa1100_gpio_handler (unsigned int irq,struct irq_desc *desc) +sa1100_gpio_handler (unsigned int __irq,struct irq_desc *desc) {unsigned int mask;
drivers/gpio/gpio-tegra.c +2 -1
@@ -266,8 +266,9 @@ static void tegra_gpio_irq_shutdown(struct irq_data *d)gpiochip_unlock_as_irq (&tegra_gpio_chip, gpio); } -static void tegra_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void tegra_gpio_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct tegra_gpio_bank *bank;int port;int pin;
drivers/gpio/gpio-timberdale.c +2 -1
@@ -192,8 +192,9 @@ out:return ret; } -static void timbgpio_irq (unsigned int irq,struct irq_desc *desc) +static void timbgpio_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct timbgpio *tgpio =irq_get_handler_data (irq);unsigned long ipr;int offset;
drivers/gpio/gpio-tz1090.c +1 -1
@@ -375,7 +375,7 @@ static int gpio_set_irq_wake(struct irq_data *data, unsigned int on)#define gpio_set_irq_wake NULL#endif -static void tz1090_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void tz1090_gpio_irq_handler (unsigned int __irq,struct irq_desc *desc) {irq_hw_number_t hw;unsigned int irq_stat, irq_no;
drivers/gpu/ipu-v3/ipu-common.c +4 -2
@@ -912,8 +912,9 @@ static void ipu_irq_handle(struct ipu_soc *ipu, const int *regs, int num_regs) } } -static void ipu_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ipu_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct ipu_soc *ipu =irq_desc_get_handler_data (desc);const int int_reg[] = {0 ,1 ,2 ,3 ,10 ,11 ,12 ,13 ,14 };struct irq_chip *chip =irq_get_chip (irq);
@@ -925,8 +926,9 @@ static void ipu_irq_handler(unsigned int irq, struct irq_desc *desc)chained_irq_exit (chip, desc); } -static void ipu_err_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ipu_err_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct ipu_soc *ipu =irq_desc_get_handler_data (desc);const int int_reg[] = {4 ,5 ,8 ,9 };struct irq_chip *chip =irq_get_chip (irq);
drivers/irqchip/exynos-combiner.c +3 -1
@@ -60,8 +60,10 @@ static void combiner_unmask_irq(struct irq_data *data)__raw_writel (mask,combiner_base (data) +COMBINER_ENABLE_SET ); } -static void combiner_handle_cascade_irq (unsigned int irq,struct irq_desc *desc) +static void combiner_handle_cascade_irq (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct combiner_chip_data *chip_data =irq_get_handler_data (irq);struct irq_chip *chip =irq_get_chip (irq);unsigned int cascade_irq, combiner_irq;
drivers/irqchip/irq-armada-370-xp.c +2 -1
@@ -448,9 +448,10 @@ static void armada_370_xp_handle_msi_irq(struct pt_regs *regs, bool is_chained)static void armada_370_xp_handle_msi_irq (struct pt_regs *r,bool b) {}#endif -static void armada_370_xp_mpic_handle_cascade_irq (unsigned int irq, +static void armada_370_xp_mpic_handle_cascade_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_get_chip (irq);unsigned long irqmap, irqn, irqsrc, cpuid;unsigned int cascade_irq;
drivers/irqchip/irq-bcm7038-l1.c +1 -1
@@ -116,7 +116,7 @@ static inline void l1_writel(u32 val, void __iomem *reg)writel (val, reg); } -static void bcm7038_l1_irq_handle (unsigned int irq,struct irq_desc *desc) +static void bcm7038_l1_irq_handle (unsigned int __irq,struct irq_desc *desc) {struct bcm7038_l1_chip *intc =irq_desc_get_handler_data (desc);struct bcm7038_l1_cpu *cpu;
drivers/irqchip/irq-bcm7120-l2.c +2 -1
@@ -52,7 +52,8 @@ struct bcm7120_l2_intc_data {const __be32 *map_mask_prop; }; -static void bcm7120_l2_intc_irq_handle (unsigned int irq,struct irq_desc *desc) +static void bcm7120_l2_intc_irq_handle (unsigned int __irq, +struct irq_desc *desc) {struct bcm7120_l2_intc_data *b =irq_desc_get_handler_data (desc);struct irq_chip *chip =irq_desc_get_chip (desc);
drivers/irqchip/irq-brcmstb-l2.c +3 -1
@@ -51,8 +51,10 @@ struct brcmstb_l2_intc_data {u32 saved_mask;/* for suspend/resume */ }; -static void brcmstb_l2_intc_irq_handle (unsigned int irq,struct irq_desc *desc) +static void brcmstb_l2_intc_irq_handle (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct brcmstb_l2_intc_data *b =irq_desc_get_handler_data (desc);struct irq_chip_generic *gc =irq_get_domain_generic_chip (b->domain,0 );struct irq_chip *chip =irq_desc_get_chip (desc);
drivers/irqchip/irq-dw-apb-ictl.c +2 -1
@@ -26,8 +26,9 @@#define APB_INT_FINALSTATUS_L 0x30#define APB_INT_FINALSTATUS_H 0x34 -static void dw_apb_ictl_handler (unsigned int irq,struct irq_desc *desc) +static void dw_apb_ictl_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct irq_chip_generic *gc =irq_get_handler_data (irq);struct irq_domain *d = gc->private;
drivers/irqchip/irq-gic.c +2 -1
@@ -286,8 +286,9 @@ static void __exception_irq_entry gic_handle_irq(struct pt_regs *regs) }while (1 ); } -static void gic_handle_cascade_irq (unsigned int irq,struct irq_desc *desc) +static void gic_handle_cascade_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct gic_chip_data *chip_data =irq_get_handler_data (irq);struct irq_chip *chip =irq_get_chip (irq);unsigned int cascade_irq, gic_irq;
drivers/irqchip/irq-imgpdc.c +3 -2
@@ -218,8 +218,9 @@ static int pdc_irq_set_wake(struct irq_data *data, unsigned int on)return 0 ; } -static void pdc_intc_perip_isr (unsigned int irq,struct irq_desc *desc) +static void pdc_intc_perip_isr (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct pdc_intc_priv *priv;unsigned int i, irq_no;
@@ -239,7 +240,7 @@ found:generic_handle_irq (irq_no); } -static void pdc_intc_syswake_isr (unsigned int irq,struct irq_desc *desc) +static void pdc_intc_syswake_isr (unsigned int __irq,struct irq_desc *desc) {struct pdc_intc_priv *priv;unsigned int syswake, irq_no;
drivers/irqchip/irq-keystone.c +2 -1
@@ -84,8 +84,9 @@ static void keystone_irq_ack(struct irq_data *d)/* nothing to do here */ } -static void keystone_irq_handler (unsigned irq,struct irq_desc *desc) +static void keystone_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct keystone_irq_device *kirq =irq_desc_get_handler_data (desc);unsigned long pending;int src, virq;
drivers/irqchip/irq-metag.c +2 -1
@@ -220,7 +220,8 @@ static int metag_internal_irq_set_affinity(struct irq_data *data,* occurred. It is this function's job to demux this irq and * figure out exactly which trigger needs servicing. */ -static void metag_internal_irq_demux (unsigned int irq,struct irq_desc *desc) +static void metag_internal_irq_demux (unsigned int __irq, +struct irq_desc *desc) {struct metag_internal_irq_priv *priv =irq_desc_get_handler_data (desc);irq_hw_number_t hw;
drivers/irqchip/irq-metag-ext.c +1 -1
@@ -447,7 +447,7 @@ static int meta_intc_irq_set_type(struct irq_data *data, unsigned int flow_type)* Whilst using TR2 to detect external interrupts is a software convention it is * (hopefully) unlikely to change. */ -static void meta_intc_irq_demux (unsigned int irq,struct irq_desc *desc) +static void meta_intc_irq_demux (unsigned int __irq,struct irq_desc *desc) {struct meta_intc_priv *priv = &meta_intc_priv;irq_hw_number_t hw;
drivers/irqchip/irq-mips-gic.c +1 -1
@@ -513,7 +513,7 @@ static void __gic_irq_dispatch(void)gic_handle_shared_int (); } -static void gic_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void gic_irq_dispatch (unsigned int __irq,struct irq_desc *desc) {__gic_irq_dispatch (); }
drivers/irqchip/irq-mmp.c +2 -1
@@ -130,8 +130,9 @@ struct irq_chip icu_irq_chip = { .irq_unmask = icu_unmask_irq, }; -static void icu_mux_irq_demux (unsigned int irq,struct irq_desc *desc) +static void icu_mux_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_domain *domain;struct icu_chip_data *data;int i;
drivers/irqchip/irq-orion.c +3 -1
@@ -107,8 +107,10 @@ IRQCHIP_DECLARE(orion_intc, "marvell,orion-intc", orion_irq_init);#define ORION_BRIDGE_IRQ_CAUSE 0x00#define ORION_BRIDGE_IRQ_MASK 0x04 -static void orion_bridge_irq_handler (unsigned int irq,struct irq_desc *desc) +static void orion_bridge_irq_handler (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_domain *d =irq_get_handler_data (irq);struct irq_chip_generic *gc =irq_get_domain_generic_chip (d,0 );
drivers/irqchip/irq-s3c24xx.c +1 -1
@@ -299,7 +299,7 @@ static struct irq_chip s3c_irq_eint0t4 = { .irq_set_type = s3c_irqext0_type, }; -static void s3c_irq_demux (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux (unsigned int __irq,struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct s3c_irq_data *irq_data =irq_desc_get_chip_data (desc);
drivers/irqchip/irq-sunxi-nmi.c +2 -1
@@ -58,8 +58,9 @@ static inline u32 sunxi_sc_nmi_read(struct irq_chip_generic *gc, u32 off)return irq_reg_readl (gc, off); } -static void sunxi_sc_nmi_handle_irq (unsigned int irq,struct irq_desc *desc) +static void sunxi_sc_nmi_handle_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_domain *domain =irq_desc_get_handler_data (desc);struct irq_chip *chip =irq_get_chip (irq);unsigned int virq =irq_find_mapping (domain,0 );
drivers/irqchip/irq-tb10x.c +2 -1
@@ -97,8 +97,9 @@ static int tb10x_irq_set_type(struct irq_data *data, unsigned int flow_type)return IRQ_SET_MASK_OK ; } -static void tb10x_irq_cascade (unsigned int irq,struct irq_desc *desc) +static void tb10x_irq_cascade (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_domain *domain =irq_desc_get_handler_data (desc);generic_handle_irq (irq_find_mapping (domain, irq));
drivers/irqchip/irq-versatile-fpga.c +2 -1
@@ -66,8 +66,9 @@ static void fpga_irq_unmask(struct irq_data *d)writel (mask, f->base +IRQ_ENABLE_SET ); } -static void fpga_irq_handle (unsigned int irq,struct irq_desc *desc) +static void fpga_irq_handle (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct fpga_irq_data *f =irq_desc_get_handler_data (desc);u32 status =readl (f->base +IRQ_STATUS );
drivers/irqchip/irq-vic.c +1 -1
@@ -226,7 +226,7 @@ static int handle_one_vic(struct vic_device *vic, struct pt_regs *regs)return handled; } -static void vic_handle_irq_cascaded (unsigned int irq,struct irq_desc *desc) +static void vic_handle_irq_cascaded (unsigned int __irq,struct irq_desc *desc) {u32 stat, hwirq;struct irq_chip *host_chip =irq_desc_get_chip (desc);
drivers/irqchip/spear-shirq.c +2 -1
@@ -183,8 +183,9 @@ static struct spear_shirq *spear320_shirq_blocks[] = { &spear320_shirq_intrcomm_ras, }; -static void shirq_handler (unsigned irq,struct irq_desc *desc) +static void shirq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct spear_shirq *shirq =irq_get_handler_data (irq);u32 pend;
drivers/mfd/asic3.c +1 -1
@@ -138,7 +138,7 @@ static void asic3_irq_flip_edge(struct asic3 *asic,spin_unlock_irqrestore (&asic->lock, flags); } -static void asic3_irq_demux (unsigned int irq,struct irq_desc *desc) +static void asic3_irq_demux (unsigned int __irq,struct irq_desc *desc) {struct asic3 *asic =irq_desc_get_handler_data (desc);struct irq_data *data =irq_desc_get_irq_data (desc);
drivers/mfd/ezx-pcap.c +2 -1
@@ -205,8 +205,9 @@ static void pcap_isr_work(struct work_struct *work) }while (gpio_get_value (pdata->gpio)); } -static void pcap_irq_handler (unsigned int irq,struct irq_desc *desc) +static void pcap_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct pcap_chip *pcap =irq_get_handler_data (irq); desc->irq_data.chip->irq_ack (&desc->irq_data);
drivers/mfd/htc-egpio.c +1 -1
@@ -98,7 +98,7 @@ static struct irq_chip egpio_muxed_chip = { .irq_unmask = egpio_unmask, }; -static void egpio_handler (unsigned int irq,struct irq_desc *desc) +static void egpio_handler (unsigned int __irq,struct irq_desc *desc) {struct egpio_info *ei =irq_desc_get_handler_data (desc);int irqpin;
drivers/mfd/jz4740-adc.c +1 -1
@@ -65,7 +65,7 @@ struct jz4740_adc {spinlock_t lock; }; -static void jz4740_adc_irq_demux (unsigned int irq,struct irq_desc *desc) +static void jz4740_adc_irq_demux (unsigned int __irq,struct irq_desc *desc) {struct irq_chip_generic *gc =irq_desc_get_handler_data (desc);uint8_t status;
drivers/mfd/pm8921-core.c +1 -1
@@ -156,7 +156,7 @@ static int pm8xxx_irq_master_handler(struct pm_irq_chip *chip, int master)return ret; } -static void pm8xxx_irq_handler (unsigned int irq,struct irq_desc *desc) +static void pm8xxx_irq_handler (unsigned int __irq,struct irq_desc *desc) {struct pm_irq_chip *chip =irq_desc_get_handler_data (desc);struct irq_chip *irq_chip =irq_desc_get_chip (desc);
drivers/mfd/t7l66xb.c +2 -1
@@ -185,8 +185,9 @@ static struct mfd_cell t7l66xb_cells[] = {/*--------------------------------------------------------------------------*/ /* Handle the T7L66XB interrupt mux */ -static void t7l66xb_irq (unsigned int irq,struct irq_desc *desc) +static void t7l66xb_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct t7l66xb *t7l66xb =irq_get_handler_data (irq);unsigned int isr;unsigned int i, irq_base;
drivers/mfd/tc6393xb.c +2 -1
@@ -523,8 +523,9 @@ static int tc6393xb_register_gpio(struct tc6393xb *tc6393xb, int gpio_base)/*--------------------------------------------------------------------------*/ static void -tc6393xb_irq (unsigned int irq,struct irq_desc *desc) +tc6393xb_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct tc6393xb *tc6393xb =irq_get_handler_data (irq);unsigned int isr;unsigned int i, irq_base;
drivers/mfd/ucb1x00-core.c +2 -1
@@ -282,8 +282,9 @@ void ucb1x00_adc_disable(struct ucb1x00 *ucb)* SIBCLK to talk to the chip. We leave the clock running until * we have finished processing all interrupts from the chip. */ -static void ucb1x00_irq (unsigned int irq,struct irq_desc *desc) +static void ucb1x00_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct ucb1x00 *ucb =irq_desc_get_handler_data (desc);unsigned int isr, i;
drivers/pci/host/pci-keystone.c +5 -2
@@ -112,8 +112,9 @@ static int ks_pcie_establish_link(struct keystone_pcie *ks_pcie)return 0 ; } -static void ks_pcie_msi_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ks_pcie_msi_irq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct keystone_pcie *ks_pcie =irq_desc_get_handler_data (desc);u32 offset = irq - ks_pcie->msi_host_irqs[0 ];struct pcie_port *pp = &ks_pcie->pp;
@@ -139,8 +140,10 @@ static void ks_pcie_msi_irq_handler(unsigned int irq, struct irq_desc *desc)* Traverse through pending legacy interrupts and invoke handler for each. Also * takes care of interrupt controller level mask/ack operation. */ -static void ks_pcie_legacy_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ks_pcie_legacy_irq_handler (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct keystone_pcie *ks_pcie =irq_desc_get_handler_data (desc);struct pcie_port *pp = &ks_pcie->pp;u32 irq_offset = irq - ks_pcie->legacy_host_irqs[0 ];
drivers/pinctrl/mediatek/pinctrl-mtk-common.c +2 -1
@@ -1116,8 +1116,9 @@ mtk_eint_debounce_process(struct mtk_pinctrl *pctl, int index) } } -static void mtk_eint_irq_handler (unsigned irq,struct irq_desc *desc) +static void mtk_eint_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct mtk_pinctrl *pctl =irq_get_handler_data (irq);unsigned int status, eint_num;
drivers/pinctrl/pinctrl-adi2.c +2 -2
@@ -530,8 +530,8 @@ static inline void preflow_handler(struct irq_desc *desc)static inline void preflow_handler (struct irq_desc *desc) { }#endif -static void adi_gpio_handle_pint_irq (unsigned int inta_irq, -struct irq_desc *desc) +static void adi_gpio_handle_pint_irq (unsigned int __inta_irq, +struct irq_desc *desc) {u32 request;u32 level_mask, hwirq;
drivers/pinctrl/pinctrl-rockchip.c +2 -1
@@ -1394,8 +1394,9 @@ static const struct gpio_chip rockchip_gpiolib_chip = {* Interrupt handling */ -static void rockchip_irq_demux (unsigned int irq,struct irq_desc *desc) +static void rockchip_irq_demux (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct rockchip_pin_bank *bank =irq_get_handler_data (irq);u32 pend;
drivers/pinctrl/pinctrl-single.c +2 -1
@@ -1679,8 +1679,9 @@ static irqreturn_t pcs_irq_handler(int irq, void *d)* Use this if you have a separate interrupt for each * pinctrl-single instance. */ -static void pcs_irq_chain_handler (unsigned int irq,struct irq_desc *desc) +static void pcs_irq_chain_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct pcs_soc_data *pcs_soc =irq_desc_get_handler_data (desc);struct irq_chip *chip;
drivers/pinctrl/pinctrl-st.c +2 -1
@@ -1472,8 +1472,9 @@ static void st_gpio_irq_handler(unsigned irq, struct irq_desc *desc)chained_irq_exit (chip, desc); } -static void st_gpio_irqmux_handler (unsigned irq,struct irq_desc *desc) +static void st_gpio_irqmux_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct st_pinctrl *info =irq_get_handler_data (irq);unsigned long status;
drivers/pinctrl/samsung/pinctrl-exynos.c +5 -2
@@ -420,8 +420,9 @@ static const struct of_device_id exynos_wkup_irq_ids[] = { };/* interrupt handler for wakeup interrupts 0..15 */ -static void exynos_irq_eint0_15 (unsigned int irq,struct irq_desc *desc) +static void exynos_irq_eint0_15 (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct exynos_weint_data *eintd =irq_get_handler_data (irq);struct samsung_pin_bank *bank = eintd->bank;struct irq_chip *chip =irq_get_chip (irq);
@@ -452,8 +453,10 @@ static inline void exynos_irq_demux_eint(unsigned long pend, }/* interrupt handler for wakeup interrupt 16 */ -static void exynos_irq_demux_eint16_31 (unsigned int irq,struct irq_desc *desc) +static void exynos_irq_demux_eint16_31 (unsigned int __irq, +struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct exynos_muxed_weint_data *eintd =irq_get_handler_data (irq);struct samsung_pinctrl_drv_data *d = eintd->banks[0 ]->drvdata;
drivers/pinctrl/samsung/pinctrl-s3c64xx.c +2 -1
@@ -408,8 +408,9 @@ static const struct irq_domain_ops s3c64xx_gpio_irqd_ops = { .xlate = irq_domain_xlate_twocell, }; -static void s3c64xx_eint_gpio_irq (unsigned int irq,struct irq_desc *desc) +static void s3c64xx_eint_gpio_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct s3c64xx_eint_gpio_data *data =irq_get_handler_data (irq);struct samsung_pinctrl_drv_data *drvdata = data->drvdata;
drivers/pinctrl/sunxi/pinctrl-sunxi.c +2 -1
@@ -709,8 +709,9 @@ static struct irq_chip sunxi_pinctrl_level_irq_chip = { IRQCHIP_EOI_IF_HANDLED, }; -static void sunxi_pinctrl_irq_handler (unsigned irq,struct irq_desc *desc) +static void sunxi_pinctrl_irq_handler (unsigned __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_get_chip (irq);struct sunxi_pinctrl *pctl =irq_get_handler_data (irq);unsigned long bank, reg, val;
drivers/sh/intc/core.c +2 -1
@@ -65,8 +65,9 @@ void intc_set_prio_level(unsigned int irq, unsigned int level)raw_spin_unlock_irqrestore (&intc_big_lock, flags); } -static void intc_redirect_irq (unsigned int irq,struct irq_desc *desc) +static void intc_redirect_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);generic_handle_irq ((unsigned int )irq_get_handler_data (irq)); }
drivers/sh/intc/virq.c +2 -1
@@ -107,8 +107,9 @@ static int add_virq_to_pirq(unsigned int irq, unsigned int virq)return 0 ; } -static void intc_virq_handler (unsigned int irq,struct irq_desc *desc) +static void intc_virq_handler (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_data *data =irq_get_irq_data (irq);struct irq_chip *chip =irq_data_get_irq_chip (data);struct intc_virq_list *entry, *vlist =irq_data_get_irq_handler_data (data);
drivers/spmi/spmi-pmic-arb.c +2 -1
@@ -451,8 +451,9 @@ static void periph_interrupt(struct spmi_pmic_arb_dev *pa, u8 apid) } } -static void pmic_arb_chained_irq (unsigned int irq,struct irq_desc *desc) +static void pmic_arb_chained_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct spmi_pmic_arb_dev *pa =irq_get_handler_data (irq);struct irq_chip *chip =irq_get_chip (irq);void __iomem *intr = pa->intr;
kernel/irq/chip.c +14 -7
@@ -383,8 +383,9 @@ static bool irq_may_run(struct irq_desc *desc)* unmask issues if necessary. */ void -handle_simple_irq (unsigned int irq,struct irq_desc *desc) +handle_simple_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);raw_spin_lock (&desc->lock);if (!irq_may_run (desc))
@@ -434,8 +435,9 @@ static void cond_unmask_irq(struct irq_desc *desc)* interrupt line is back to inactive. */ void -handle_level_irq (unsigned int irq,struct irq_desc *desc) +handle_level_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);raw_spin_lock (&desc->lock);mask_ack_irq (desc);
@@ -505,8 +507,9 @@ static void cond_unmask_eoi_irq(struct irq_desc *desc, struct irq_chip *chip)* details in hardware, transparently. */ void -handle_fasteoi_irq (unsigned int irq,struct irq_desc *desc) +handle_fasteoi_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip = desc->irq_data.chip;raw_spin_lock (&desc->lock);
@@ -561,8 +564,9 @@ EXPORT_SYMBOL_GPL(handle_fasteoi_irq);* loop is left. */ void -handle_edge_irq (unsigned int irq,struct irq_desc *desc) +handle_edge_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);raw_spin_lock (&desc->lock); desc->istate &= ~(IRQS_REPLAY |IRQS_WAITING );
@@ -624,8 +628,9 @@ EXPORT_SYMBOL(handle_edge_irq);* Similar as the above handle_edge_irq, but using eoi and w/o the * mask/unmask logic. */ -void handle_edge_eoi_irq (unsigned int irq,struct irq_desc *desc) +void handle_edge_eoi_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_desc_get_chip (desc);raw_spin_lock (&desc->lock);
@@ -671,8 +676,9 @@ out_eoi:* Per CPU interrupts on SMP machines without locking requirements */ void -handle_percpu_irq (unsigned int irq,struct irq_desc *desc) +handle_percpu_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_desc_get_chip (desc);kstat_incr_irqs_this_cpu (irq, desc);
@@ -698,8 +704,9 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc)* contain the real device id for the cpu on which this handler is * called */ -void handle_percpu_devid_irq (unsigned int irq,struct irq_desc *desc) +void handle_percpu_devid_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_desc_get_chip (desc);struct irqaction *action = desc->action;void *dev_id =raw_cpu_ptr (action->percpu_dev_id);
kernel/irq/handle.c +2 -1
@@ -27,8 +27,9 @@* * Handles spurious and unhandled IRQ's. It also prints a debugmessage. */ -void handle_bad_irq (unsigned int irq,struct irq_desc *desc) +void handle_bad_irq (unsigned int __irq,struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);print_irq_desc (irq, desc);kstat_incr_irqs_this_cpu (irq, desc);ack_bad_irq (irq);
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Quoted 1 line · Julia Lawall
Better formatted diff.
Great thanks to you, Julia!
It seems really attractively, I will try to figure out whether I have caught all the cases.
BTW, a new version of these patch set has been posted at:
http://comments.gmane.org/gmane.linux.kernel.pci/42320
I have also push the new version to github in case you need to access it:
https://github.com/jiangliu/linux.git irq:irqdesc_v2
Thanks!
Gerry
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
The following are the cases that require some manual attention, either because the handler is a local variable or because it is some other kind of expression.
julia
Local variable: arch/x86/kernel/apic/io_apic.c:932 hdl
Local variable: arch/sparc/kernel/leon_kernel.c:232 flow_handler
Local variable: arch/sparc/kernel/leon_kernel.c:257 flow_handler
Local variable: arch/powerpc/platforms/52xx/mpc52xx_pic.c:199 handler
Local variable: arch/powerpc/platforms/52xx/mpc52xx_pic.c:364 hndlr
Local variable: arch/powerpc/sysdev/qe_lib/qe_ic.c:377 high_handler
Local variable: arch/powerpc/sysdev/qe_lib/qe_ic.c:372 low_handler
Local variable: arch/mips/cavium-octeon/octeon-irq.c:69 handler
Local variable: arch/mips/alchemy/common/irq.c:494 handler
Local variable: arch/mips/alchemy/common/irq.c:706 hdl
Local variable: arch/blackfin/mach-common/ints-priority.c:693 handle
Local variable: arch/tile/kernel/irq.c:239 handle
Local variable: arch/m68k/kernel/ints.c:124 handle
Local variable: drivers/irqchip/irq-clps711x.c:152 handler
Local variable: drivers/gpio/gpio-ep93xx.c:211 handler
Local variable: drivers/gpio/gpiolib.c:447 parent_handler
Local variable: drivers/pinctrl/intel/pinctrl-cherryview.c:1328 handler
Local variable: kernel/irq/irqdomain.c:946 handler
Local variable: kernel/irq/irqdomain.c:1251 handler
Local variable: kernel/irq/chip.c:787 handle
Arbitrary expression: arch/ia64/kernel/iosapic.c:613 trigger == IOSAPIC_EDGE ? handle_edge_irq : handle_level_irq Arbitrary expression: arch/powerpc/sysdev/mpic.c:1669 & mpic_cascade
Arbitrary expression: arch/mips/dec/ioasic-irq.c:111 1 << ( i - base ) & IO_IRQ_DMA_INFO ? handle_edge_irq : handle_fasteoi_irq Arbitrary expression: drivers/irqchip/irq-or1k-pic.c:131 pic -> handle
Arbitrary expression: drivers/iio/industrialio-trigger.c:449 & handle_simple_irq
Arbitrary expression: drivers/gpio/gpio-sta2x11.c:347 ct -> handler
Arbitrary expression: drivers/gpio/gpiolib.c:482 chip -> irq_handler
Arbitrary expression: drivers/pinctrl/samsung/pinctrl-s3c24xx.c:517 handlers [ i ]
Arbitrary expression: drivers/pinctrl/samsung/pinctrl-s3c64xx.c:734 s3c64xx_eint0_handlers [ i ]
Arbitrary expression: drivers/staging/iio/iio_dummy_evgen.c:89 & handle_simple_irq
Arbitrary expression: kernel/irq/generic-chip.c:461 ct -> handler
Arbitrary expression: kernel/irq/msi.c:167 info -> handler
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Quoted 3 lines · Julia Lawall
The following are the cases that require some manual attention, either because the handler is a local variable or because it is some other kind of expression.
yep, found it in the logs already and found a missing search expression:
| gpiochip_set_chained_irqchip@p(e1,e2,e3,\(lih\|ih\|eh\))
This is really impressive work!!!!
Thanks
tglx
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Quoted 6 lines · Thomas Gleixner
Quoted 3 lines · Julia Lawall
The following are the cases that require some manual attention, either because the handler is a local variable or because it is some other kind of expression.
Quoted 6 lines
yep, found it in the logs already and found a missing search expression:
| gpiochip_set_chained_irqchip@p(e1,e2,e3,\(lih\|ih\|eh\))
This is really impressive work!!!!
Thanks :)
I'll add the above pattern, but I guess you already have the results for that case.
julia
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Quoted 13 lines · Julia Lawall
Quoted 11 lines · Thomas Gleixner
Quoted 3 lines · Julia Lawall
The following are the cases that require some manual attention, either because the handler is a local variable or because it is some other kind of expression.
yep, found it in the logs already and found a missing search expression:
| gpiochip_set_chained_irqchip@p(e1,e2,e3,\(lih\|ih\|eh\))
Quoted 6 lines
Quoted 1 line
This is really impressive work!!!!
Thanks :)
I'll add the above pattern, but I guess you already have the results for that case.
Yes.
I did some more experiments and analyzed all functions which have the signature
[static] void f(T irq, struct irq_desc *desc)
where T is either 'unsigned int' or 'u32'
That throws up a handful of false positives, but those are functions which are called from a real handler function, so we want to look at those anyway.
Now where my cocci foo ends is when I try to match both types in the same rule, i.e.
@ fun exists @
identifier hf,irq,desc;
typedef u32;
@@
(
void hf(unsigned irq, struct irq_desc *desc) { ... } |
void hf(u32 irq, struct irq_desc *desc) { ... } )
results in:
Fatal error: exception Failure("minus: parse error:
= File "../cocci/find-pot-handler.cocci", line 7, column 5, charpos = 63
around = 'hf', whole content = void hf(unsigned irq, struct irq_desc *desc) { ... }")
I tried a couple of other variants, but finally gave up and ran a cocci script first which does s/u32/unsigned/ on those functions, but of course because I'm lazy I wanted to do everything in one go. :)
Aside of that the ruleset you gave me works nicely except for that part:
// no uses of the first parameter before the assignment @@
identifier fun.hf,irq;
expression e;
type T;
fresh identifier firq = "__" ## irq;
position r.p,p1 != {s.p1,s1.p1};
@@
hf(T@p
- irq
+ firq
,...) {
... when != irq
when strict
? irq@p1 = e
... when any
}
That lacks a:
+ unsigned int irq;
and therefor missed to add the local variable 'unsigned int irq' in case the parameter is only used for local storage.
That was simple enough to fix even for me :)
Thanks,
tglx
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Quoted 14 lines
Now where my cocci foo ends is when I try to match both types in the same rule, i.e.
@ fun exists @
identifier hf,irq,desc;
typedef u32;
@@(
voidhf(unsigned irq, struct irq_desc *desc){ ... } |
voidhf(u32 irq, struct irq_desc *desc){ ... } )
Quoted 5 lines
results in:
Fatal error: exception Failure("minus: parse error:
= File "../cocci/find-pot-handler.cocci", line 7, column 5, charpos = 63around = 'hf', whole content = void hf(unsigned irq, struct irq_desc *desc) { ... }")
Yeah, sorry, it doesn't work. There is no way to put a disjunction on a function definition or a parameter type.
Quoted 26 lines
I tried a couple of other variants, but finally gave up and ran a cocci script first which does s/u32/unsigned/ on those functions, but of course because I'm lazy I wanted to do everything in one go. :)
Aside of that the ruleset you gave me works nicely except for that part:
// no uses of the first parameter before the assignment @@
identifier fun.hf,irq;
expression e;
type T;
fresh identifier firq = "__" ## irq;
position r.p,p1 != {s.p1,s1.p1};
@@hf(T@p
- irq
+ firq
,...) {
... when != irq
when strict
? irq@p1 = e
... when any
}
Quoted 6 lines
That lacks a:
+ unsigned int irq;
and therefor missed to add the local variable 'unsigned int irq' in case the parameter is only used for local storage.
Oops, thanks.
julia
Quoted 7 lines
That was simple enough to fix even for me :)
Thanks,
tglx
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
In reply to Thomas GleixnerThe semantic patch below considers the problem from another point of view, to find functions that may have a handler as an argument. The results that are different than those considered already are as follows:
arch/x86/platform/uv/uv_irq.c:106 irq_domain_set_info
has a possible handler in argument 6arch/sparc/kernel/leon_pci_grpci2.c:815 leon_update_virq_handling
has a possible handler in argument 2arch/sparc/kernel/leon_kernel.c:79 leon_build_device_irq
has a possible handler in argument 2arch/arm/mach-omap2/prm_common.c:331 irq_alloc_generic_chip
has a possible handler in argument 5arch/mips/cavium-octeon/octeon-irq.c:1231 octeon_irq_set_ciu_mapping
has a possible handler in argument 6arch/blackfin/mach-common/ints-priority.c:805 bfin_set_irq_handler
has a possible handler in argument 2arch/m68k/q40/q40ints.c:84 m68k_setup_irq_controller
has a possible handler in argument 2drivers/gpio/gpio-pcf857x.c:362 gpiochip_irqchip_add
has a possible handler in argument 4
The semantic patch looks for a function that has as argument a function that has arguments of type (unsigned int irq, struct irq_desc *desc) and a void return type. It also looks for functions that have as argument a bunch of known irq handlers.
julia
@initialize:ocaml@
@@
let tbl = Hashtbl.create 101
let ln = Str.regexp "linux-next/" (* update as appropriate *)
let _ =
List.iter (function x -> Hashtbl.add tbl x ())
[("__irq_set_handler",2);("irq_set_handler",2);
("irq_set_chained_handler",2);("irq_alloc_generic_chip",4);
("irq_alloc_domain_generic_chips",5);("irq_set_chip_and_handler_name",3);
("irq_set_chip_and_handler",3);("__irq_set_handler_locked",2);
("__irq_set_chip_handler_name_locked",3);("__irq_set_preflow_handler",2);
("gpiochip_set_chained_irqchip",4)]let update g f n p =
let n = n + 1 in
let entry = (g,n) in
try let _ = Hashtbl.find tbl entry in ()
with Not_found ->
begin
Hashtbl.add tbl entry ();
let p = List.hd p in
Printf.printf "%s:%d %s\n\thas a possible handler in argument %d\n"
(List.nth (Str.split ln p.file) 1) p.line g
n
end
@possible_handler@
identifier f,irq,desc;
@@
void f(unsigned int irq, struct irq_desc *desc) { ... }
@call@
identifier g,possible_handler.f;
expression list[n] es;
position p;
@@
g(es,f@p,...)
@script:ocaml@
p << call.p;
f << possible_handler.f;
g << call.g;
n << call.n;
@@
update g f n p
@call2@
identifier g,f;
expression list[n] es;
position p;
symbol handle_level_irq,handle_simple_irq,handle_edge_irq,
handle_fasteoi_irq,handle_percpu_irq;
@@
g(es,\(handle_level_irq@f@p\|handle_simple_irq@f@p\|handle_edge_irq@f@p\|
handle_fasteoi_irq@f@p\|handle_percpu_irq@f@p\),...)
@script:ocaml@
p << call2.p;
f << call2.f;
g << call2.g;
n << call2.n;
@@
update g f n p
Re: [RFC v1 14/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
In reply to Jiang LiuQuoted 15 lines · Jiang Liu
Quoted 7 lines · Thomas Gleixner
Quoted 6 lines · Jiang Liu
include/linux/irqdesc.h +0
-0@@ -99,6 +99,11 @@ static inline struct irq_desc *irq_data_to_desc(struct irq_data *data) return container_of(data->common, struct irq_desc, irq_common_data); }Quoted 7 lines
include/linux/irqdesc.h static inline struct irq_desc *irq_data_to_desc(struct irq_data *data) · line 106
Quoted 5 lines
include/linux/irqdesc.h +5
-0+static inline unsigned int irq_desc_get_irq (struct irq_desc *desc) +{ +return desc->irq_data.irq; +} +Does not apply either.
Quoted 2 lines
Hi Thomas,
Will check the base again.
I assume you applied it on top of the common data split. See the hunk above.
Thanks,
tglx
RFC 15/25 genirq: Kill the first parameter 'irq' of irq_flow_handler_t
In reply to Jiang LiuNow most IRQ flow handlers make no use of the first parameter 'irq'. And for those who do make use of 'irq', we could easily get the irq number through irq_desc->irq_data->irq. So kill the first parameter 'irq' of irq_flow_handler_t.
To ease review, I have split the changes into several parts, though they should be merge as one to support bisecting.
Signed-off-by Jiang Liu <[email protected]>
--- arch/arm/common/it8152.c | 2 +- arch/arm/common/locomo.c | 3 ++- arch/arm/common/sa1111.c | 4 ++-- arch/arm/include/asm/hardware/it8152.h | 2 +- arch/arm/include/asm/mach/irq.h | 4 ++-- arch/arm/mach-dove/irq.c | 5 +++-- arch/arm/mach-footbridge/isa-irq.c | 4 ++-- arch/arm/mach-gemini/gpio.c | 2 +- arch/arm/mach-imx/3ds_debugboard.c | 2 +- arch/arm/mach-imx/mach-mx31ads.c | 2 +- arch/arm/mach-iop13xx/msi.c | 2 +- arch/arm/mach-lpc32xx/irq.c | 4 ++-- arch/arm/mach-omap1/fpga.c | 2 +- arch/arm/mach-omap2/prm_common.c | 2 +- arch/arm/mach-pxa/balloon3.c | 3 ++- arch/arm/mach-pxa/cm-x2xx-pci.c | 4 ++-- arch/arm/mach-pxa/lpd270.c | 3 ++- arch/arm/mach-pxa/pcm990-baseboard.c | 1 + arch/arm/mach-pxa/viper.c | 3 ++- arch/arm/mach-pxa/zeus.c | 3 ++- arch/arm/mach-rpc/ecard.c | 2 +- arch/arm/mach-s3c64xx/common.c | 8 ++++---- arch/arm/mach-sa1100/neponset.c | 2 +- arch/arm/plat-orion/gpio.c | 2 +- 24 files changed, 39 insertions(+), 32 deletions(-)
arch/arm/common/it8152.c +1 -1
@@ -95,7 +95,7 @@ void it8152_init_irq(void) } } -void it8152_irq_demux (unsigned int irq,struct irq_desc *desc) +void it8152_irq_demux (struct irq_desc *desc) {int bits_pd, bits_lp, bits_ld;int i;
arch/arm/common/locomo.c +2 -1
@@ -138,9 +138,10 @@ static struct locomo_dev_info locomo_devices[] = { }, }; -static void locomo_handler (unsigned int irq,struct irq_desc *desc) +static void locomo_handler (struct irq_desc *desc) {struct locomo *lchip =irq_desc_get_chip_data (desc); +unsigned int irq;int req, i;/* Acknowledge the parent IRQ */
arch/arm/common/sa1111.c +2 -2
@@ -197,7 +197,7 @@ static struct sa1111_dev_info sa1111_devices[] = {* will call us again if there are more interrupts to process. */ static void -sa1111_irq_handler (unsigned int irq,struct irq_desc *desc) +sa1111_irq_handler (struct irq_desc *desc) {unsigned int stat0, stat1, i;struct sa1111 *sachip =irq_desc_get_handler_data (desc);
@@ -213,7 +213,7 @@ sa1111_irq_handler(unsigned int irq, struct irq_desc *desc)sa1111_writel (stat1, mapbase +SA1111_INTSTATCLR1 );if (stat0 ==0 && stat1 ==0 ) { -do_bad_IRQ (irq, desc); +do_bad_IRQ (desc);return ; }
arch/arm/include/asm/hardware/it8152.h +1 -1
@@ -106,7 +106,7 @@ extern void __iomem *it8152_base_address;struct pci_dev ;struct pci_sys_data ; -extern void it8152_irq_demux (unsigned int irq,struct irq_desc *desc); +extern void it8152_irq_demux (struct irq_desc *desc);extern void it8152_init_irq (void );extern int it8152_pci_map_irq (const struct pci_dev *dev,u8 slot,u8 pin);extern int it8152_pci_setup (int nr,struct pci_sys_data *sys);
arch/arm/include/asm/mach/irq.h +2 -2
@@ -23,10 +23,10 @@ extern int show_fiq_list(struct seq_file *, int);/* * This is for easy migration, but should be changed in the source */ -#define do_bad_IRQ (irq,desc) \ +#define do_bad_IRQ (desc) \ do { \ raw_spin_lock(&desc->lock); \ - handle_bad_irq(irq, desc); \ + handle_bad_irq(desc); \ raw_spin_unlock(&desc->lock); \ } while(0)
arch/arm/mach-dove/irq.c +3 -2
@@ -69,13 +69,14 @@ static struct irq_chip pmu_irq_chip = { .irq_ack = pmu_irq_ack, }; -static void pmu_irq_handler (unsigned int irq,struct irq_desc *desc) +static void pmu_irq_handler (struct irq_desc *desc) {unsigned long cause =readl (PMU_INTERRUPT_CAUSE ); +unsigned int irq; cause &=readl (PMU_INTERRUPT_MASK );if (cause ==0 ) { -do_bad_IRQ (irq, desc); +do_bad_IRQ (desc);return ; }
arch/arm/mach-footbridge/isa-irq.c +2 -2
@@ -88,12 +88,12 @@ static struct irq_chip isa_hi_chip = { };static void -isa_irq_handler (unsigned int irq,struct irq_desc *desc) +isa_irq_handler (struct irq_desc *desc) {unsigned int isa_irq = *(unsigned char *)PCIIACK_BASE ;if (isa_irq <_ISA_IRQ (0 ) || isa_irq >=_ISA_IRQ (16 )) { -do_bad_IRQ (isa_irq, desc); +do_bad_IRQ (desc);return ; }
arch/arm/mach-gemini/gpio.c +1 -1
@@ -126,7 +126,7 @@ static int gpio_set_irq_type(struct irq_data *d, unsigned int type)return 0 ; } -static void gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void gpio_irq_handler (struct irq_desc *desc) {unsigned int port = (unsigned int )irq_desc_get_handler_data (desc);unsigned int gpio_irq_no, irq_stat;
arch/arm/mach-imx/3ds_debugboard.c +1 -1
@@ -85,7 +85,7 @@ static struct platform_device smsc_lan9217_device = { .resource = smsc911x_resources, }; -static void mxc_expio_irq_handler (u32 irq,struct irq_desc *desc) +static void mxc_expio_irq_handler (struct irq_desc *desc) {u32 imr_val;u32 int_valid;
arch/arm/mach-imx/mach-mx31ads.c +1 -1
@@ -154,7 +154,7 @@ static inline void mxc_init_imx_uart(void)imx31_add_imx_uart0 (&uart_pdata); } -static void mx31ads_expio_irq_handler (u32 irq,struct irq_desc *desc) +static void mx31ads_expio_irq_handler (struct irq_desc *desc) {u32 imr_val;u32 int_valid;
arch/arm/mach-iop13xx/msi.c +1 -1
@@ -91,7 +91,7 @@ static void (*write_imipr[])(u32) = { write_imipr_3, }; -static void iop13xx_msi_handler (unsigned int irq,struct irq_desc *desc) +static void iop13xx_msi_handler (struct irq_desc *desc) {int i, j;unsigned long status;
arch/arm/mach-lpc32xx/irq.c +2 -2
@@ -370,7 +370,7 @@ static struct irq_chip lpc32xx_irq_chip = { .irq_set_wake = lpc32xx_irq_wake }; -static void lpc32xx_sic1_handler (unsigned int irq,struct irq_desc *desc) +static void lpc32xx_sic1_handler (struct irq_desc *desc) {unsigned long ints =__raw_readl (LPC32XX_INTC_STAT (LPC32XX_SIC1_BASE ));
@@ -383,7 +383,7 @@ static void lpc32xx_sic1_handler(unsigned int irq, struct irq_desc *desc) } } -static void lpc32xx_sic2_handler (unsigned int irq,struct irq_desc *desc) +static void lpc32xx_sic2_handler (struct irq_desc *desc) {unsigned long ints =__raw_readl (LPC32XX_INTC_STAT (LPC32XX_SIC2_BASE ));
arch/arm/mach-omap1/fpga.c +1 -1
@@ -87,7 +87,7 @@ static void fpga_mask_ack_irq(struct irq_data *d)fpga_ack_irq (d); } -static void innovator_fpga_IRQ_demux (unsigned int irq,struct irq_desc *desc) +static void innovator_fpga_IRQ_demux (struct irq_desc *desc) {u32 stat;int fpga_irq;
arch/arm/mach-omap2/prm_common.c +1 -1
@@ -102,7 +102,7 @@ static void omap_prcm_events_filter_priority(unsigned long *events,* dispatched accordingly. Clearing of the wakeup events should be * done by the SoC specific individual handlers. */ -static void omap_prcm_irq_handler (unsigned int irq,struct irq_desc *desc) +static void omap_prcm_irq_handler (struct irq_desc *desc) {unsigned long pending[OMAP_PRCM_MAX_NR_PENDING_REG ];unsigned long priority_pending[OMAP_PRCM_MAX_NR_PENDING_REG ];
arch/arm/mach-pxa/balloon3.c +2 -1
@@ -496,8 +496,9 @@ static struct irq_chip balloon3_irq_chip = { .irq_unmask = balloon3_unmask_irq, }; -static void balloon3_irq_handler (unsigned int irq,struct irq_desc *desc) +static void balloon3_irq_handler (struct irq_desc *desc) { +unsigned int irq;unsigned long pending =__raw_readl (BALLOON3_INT_CONTROL_REG ) & balloon3_irq_enabled; do {
arch/arm/mach-pxa/cm-x2xx-pci.c +2 -2
@@ -29,12 +29,12 @@void __iomem *it8152_base_address;static int cmx2xx_it8152_irq_gpio; -static void cmx2xx_it8152_irq_demux (unsigned int irq,struct irq_desc *desc) +static void cmx2xx_it8152_irq_demux (struct irq_desc *desc) {/* clear our parent irq */ desc->irq_data.chip->irq_ack (&desc->irq_data); -it8152_irq_demux (irq, desc); +it8152_irq_demux (desc); }void __cmx2xx_pci_init_irq (int irq_gpio)
arch/arm/mach-pxa/lpd270.c +2 -1
@@ -120,9 +120,10 @@ static struct irq_chip lpd270_irq_chip = { .irq_unmask = lpd270_unmask_irq, }; -static void lpd270_irq_handler (unsigned int irq,struct irq_desc *desc) +static void lpd270_irq_handler (struct irq_desc *desc) {unsigned long pending; +unsigned int irq; pending =__raw_readw (LPD270_INT_STATUS ) & lpd270_irq_enabled; do {
arch/arm/mach-pxa/pcm990-baseboard.c +1 -0
@@ -287,6 +287,7 @@ static struct irq_chip pcm990_irq_chip = {static void pcm990_irq_handler (unsigned int irq,struct irq_desc *desc) {unsigned long pending; +unsigned int irq; pending = ~pcm990_cpld_readb (PCM990_CTRL_INTSETCLR ); pending &= pcm990_irq_enabled;
arch/arm/mach-pxa/viper.c +2 -1
@@ -276,9 +276,10 @@ static inline unsigned long viper_irq_pending(void) viper_irq_enabled_mask; } -static void viper_irq_handler (unsigned int irq,struct irq_desc *desc) +static void viper_irq_handler (struct irq_desc *desc) {unsigned long pending; +unsigned int irq; pending =viper_irq_pending (); do {
arch/arm/mach-pxa/zeus.c +2 -1
@@ -105,9 +105,10 @@ static inline unsigned long zeus_irq_pending(void)return __raw_readw (ZEUS_CPLD_ISA_IRQ ) & zeus_irq_enabled_mask; } -static void zeus_irq_handler (unsigned int irq,struct irq_desc *desc) +static void zeus_irq_handler (struct irq_desc *desc) {unsigned long pending; +unsigned int irq; pending =zeus_irq_pending (); do {
arch/arm/mach-rpc/ecard.c +1 -1
@@ -552,7 +552,7 @@ static void ecard_check_lockup(struct irq_desc *desc) }static void -ecard_irq_handler (unsigned int irq,struct irq_desc *desc) +ecard_irq_handler (struct irq_desc *desc) {ecard_t *ec;int called =0 ;
arch/arm/mach-s3c64xx/common.c +4 -4
@@ -389,22 +389,22 @@ static inline void s3c_irq_demux_eint(unsigned int start, unsigned int end) } } -static void s3c_irq_demux_eint0_3 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint0_3 (struct irq_desc *desc) {s3c_irq_demux_eint (0 ,3 ); } -static void s3c_irq_demux_eint4_11 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint4_11 (struct irq_desc *desc) {s3c_irq_demux_eint (4 ,11 ); } -static void s3c_irq_demux_eint12_19 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint12_19 (struct irq_desc *desc) {s3c_irq_demux_eint (12 ,19 ); } -static void s3c_irq_demux_eint20_27 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint20_27 (struct irq_desc *desc) {s3c_irq_demux_eint (20 ,27 ); }
arch/arm/mach-sa1100/neponset.c +1 -1
@@ -166,7 +166,7 @@ static struct sa1100_port_fns neponset_port_fns = {* ensure that the IRQ signal is deasserted before returning. This * is rather unfortunate. */ -static void neponset_irq_handler (unsigned int irq,struct irq_desc *desc) +static void neponset_irq_handler (struct irq_desc *desc) {struct neponset_drvdata *d =irq_desc_get_handler_data (desc);unsigned int irr;
arch/arm/plat-orion/gpio.c +1 -1
@@ -407,7 +407,7 @@ static int gpio_irq_set_type(struct irq_data *d, u32 type)return 0 ; } -static void gpio_irq_handler (unsigned irq,struct irq_desc *desc) +static void gpio_irq_handler (struct irq_desc *desc) {struct orion_gpio_chip *ochip =irq_desc_get_handler_data (desc);u32 cause, type;
Signature · 1 line
1.7.10.4
Re: [RFC v1 15/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
arch/arm/common/locomo.c static struct locomo_dev_info locomo_devices[] = { · line 145
Quoted 6 lines · Jiang Liu
arch/arm/common/locomo.c +2
-1-static void locomo_handler (unsigned int irq,struct irq_desc *desc) +static void locomo_handler (struct irq_desc *desc) {struct locomo *lchip =irq_desc_get_chip_data (desc); +unsigned int irq;int req, i;
That leaves irq unitialized ....
Thanks,
tglx
Re: [RFC v1 15/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Quoted 9 lines · Thomas Gleixner
arch/arm/common/locomo.c static struct locomo_dev_info locomo_devices[] = { · line 145
Quoted 6 lines · Jiang Liu
arch/arm/common/locomo.c +2
-1-static void locomo_handler (unsigned int irq,struct irq_desc *desc) +static void locomo_handler (struct irq_desc *desc) {struct locomo *lchip =irq_desc_get_chip_data (desc); +unsigned int irq;int req, i;That leaves irq unitialized ....
That should be OK, 'irq' here is just a local variable. Actually it may be changed as:
if (req) {
/* generate the next interrupt(s) */
- irq = lchip->irq_base;
+ unsigned int irq = lchip->irq_base;
for (i = 0; i <= 3; i++, irq++) {
if (req & (0x0100 << i)) {
generic_handle_irq(irq);
}
}
}Quoted 5 lines
Thanks,
tglx
Re: [RFC v1 15/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
Quoted 14 lines · Jiang Liu
Quoted 9 lines · Thomas Gleixner
arch/arm/common/locomo.c static struct locomo_dev_info locomo_devices[] = { · line 145
Quoted 6 lines · Jiang Liu
arch/arm/common/locomo.c +2
-1-static void locomo_handler (unsigned int irq,struct irq_desc *desc) +static void locomo_handler (struct irq_desc *desc) {struct locomo *lchip =irq_desc_get_chip_data (desc); +unsigned int irq;int req, i;That leaves irq unitialized ....
That should be OK, 'irq' here is just a local variable. Actually it may be changed as:
if (req) { /* generate the next interrupt(s) */
Review
Quoted 2 lines
(quoted diff) +1
-1- irq = lchip->irq_base; + unsigned int irq = lchip->irq_base;
Indeed.
Hans Ulli Kroll
maintainerRe: [RFC v1 15/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
In reply to Jiang LiuQuoted 425 lines · Jiang Liu
Now most IRQ flow handlers make no use of the first parameter 'irq'. And for those who do make use of 'irq', we could easily get the irq number through
irq_desc->irq_data->irq. So kill the first parameter 'irq' ofirq_flow_handler_t.To ease review, I have split the changes into several parts, though they should be merge as one to support bisecting.
Signed-off-by Jiang Liu <[email protected]>--- arch/arm/common/it8152.c | 2 +- arch/arm/common/locomo.c | 3 ++- arch/arm/common/sa1111.c | 4 ++-- arch/arm/include/asm/hardware/it8152.h | 2 +- arch/arm/include/asm/mach/irq.h | 4 ++-- arch/arm/mach-dove/irq.c | 5 +++-- arch/arm/mach-footbridge/isa-irq.c | 4 ++-- arch/arm/mach-gemini/gpio.c | 2 +- arch/arm/mach-imx/3ds_debugboard.c | 2 +- arch/arm/mach-imx/mach-mx31ads.c | 2 +- arch/arm/mach-iop13xx/msi.c | 2 +- arch/arm/mach-lpc32xx/irq.c | 4 ++-- arch/arm/mach-omap1/fpga.c | 2 +- arch/arm/mach-omap2/prm_common.c | 2 +- arch/arm/mach-pxa/balloon3.c | 3 ++- arch/arm/mach-pxa/cm-x2xx-pci.c | 4 ++-- arch/arm/mach-pxa/lpd270.c | 3 ++- arch/arm/mach-pxa/pcm990-baseboard.c | 1 + arch/arm/mach-pxa/viper.c | 3 ++- arch/arm/mach-pxa/zeus.c | 3 ++- arch/arm/mach-rpc/ecard.c | 2 +- arch/arm/mach-s3c64xx/common.c | 8 ++++---- arch/arm/mach-sa1100/neponset.c | 2 +- arch/arm/plat-orion/gpio.c | 2 +- 24 files changed, 39 insertions(+), 32 deletions(-)arch/arm/common/it8152.c +1
-1@@ -95,7 +95,7 @@ void it8152_init_irq(void) } } -void it8152_irq_demux (unsigned int irq,struct irq_desc *desc) +void it8152_irq_demux (struct irq_desc *desc) {int bits_pd, bits_lp, bits_ld;int i;arch/arm/common/locomo.c +2
-1@@ -138,9 +138,10 @@ static struct locomo_dev_info locomo_devices[] = { }, }; -static void locomo_handler (unsigned int irq,struct irq_desc *desc) +static void locomo_handler (struct irq_desc *desc) {struct locomo *lchip =irq_desc_get_chip_data (desc); +unsigned int irq;int req, i;/* Acknowledge the parent IRQ */ arch/arm/common/sa1111.c +2
-2@@ -197,7 +197,7 @@ static struct sa1111_dev_info sa1111_devices[] = {* will call us again if there are more interrupts to process. */ static void -sa1111_irq_handler (unsigned int irq,struct irq_desc *desc) +sa1111_irq_handler (struct irq_desc *desc) {unsigned int stat0, stat1, i;struct sa1111 *sachip =irq_desc_get_handler_data (desc);@@ -213,7 +213,7 @@ sa1111_irq_handler(unsigned int irq, struct irq_desc *desc)sa1111_writel (stat1, mapbase +SA1111_INTSTATCLR1 );if (stat0 ==0 && stat1 ==0 ) { -do_bad_IRQ (irq, desc); +do_bad_IRQ (desc);return ; }arch/arm/include/asm/hardware/it8152.h +1
-1@@ -106,7 +106,7 @@ extern void __iomem *it8152_base_address;struct pci_dev ;struct pci_sys_data ; -extern void it8152_irq_demux (unsigned int irq,struct irq_desc *desc); +extern void it8152_irq_demux (struct irq_desc *desc);extern void it8152_init_irq (void );extern int it8152_pci_map_irq (const struct pci_dev *dev,u8 slot,u8 pin);extern int it8152_pci_setup (int nr,struct pci_sys_data *sys);arch/arm/include/asm/mach/irq.h +2
-2@@ -23,10 +23,10 @@ extern int show_fiq_list(struct seq_file *, int);/* * This is for easy migration, but should be changed in the source */ -#define do_bad_IRQ (irq,desc) \ +#define do_bad_IRQ (desc) \ do { \ raw_spin_lock(&desc->lock); \ - handle_bad_irq(irq, desc); \ + handle_bad_irq(desc); \ raw_spin_unlock(&desc->lock); \ } while(0)arch/arm/mach-dove/irq.c +3
-2@@ -69,13 +69,14 @@ static struct irq_chip pmu_irq_chip = { .irq_ack = pmu_irq_ack, }; -static void pmu_irq_handler (unsigned int irq,struct irq_desc *desc) +static void pmu_irq_handler (struct irq_desc *desc) {unsigned long cause =readl (PMU_INTERRUPT_CAUSE ); +unsigned int irq; cause &=readl (PMU_INTERRUPT_MASK );if (cause ==0 ) { -do_bad_IRQ (irq, desc); +do_bad_IRQ (desc);return ; }arch/arm/mach-footbridge/isa-irq.c +2
-2@@ -88,12 +88,12 @@ static struct irq_chip isa_hi_chip = { };static void -isa_irq_handler (unsigned int irq,struct irq_desc *desc) +isa_irq_handler (struct irq_desc *desc) {unsigned int isa_irq = *(unsigned char *)PCIIACK_BASE ;if (isa_irq <_ISA_IRQ (0 ) || isa_irq >=_ISA_IRQ (16 )) { -do_bad_IRQ (isa_irq, desc); +do_bad_IRQ (desc);return ; }arch/arm/mach-gemini/gpio.c +1
-1@@ -126,7 +126,7 @@ static int gpio_set_irq_type(struct irq_data *d, unsigned int type)return 0 ; } -static void gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void gpio_irq_handler (struct irq_desc *desc) {unsigned int port = (unsigned int )irq_desc_get_handler_data (desc);unsigned int gpio_irq_no, irq_stat;arch/arm/mach-imx/3ds_debugboard.c +1
-1@@ -85,7 +85,7 @@ static struct platform_device smsc_lan9217_device = { .resource = smsc911x_resources, }; -static void mxc_expio_irq_handler (u32 irq,struct irq_desc *desc) +static void mxc_expio_irq_handler (struct irq_desc *desc) {u32 imr_val;u32 int_valid;arch/arm/mach-imx/mach-mx31ads.c +1
-1@@ -154,7 +154,7 @@ static inline void mxc_init_imx_uart(void)imx31_add_imx_uart0 (&uart_pdata); } -static void mx31ads_expio_irq_handler (u32 irq,struct irq_desc *desc) +static void mx31ads_expio_irq_handler (struct irq_desc *desc) {u32 imr_val;u32 int_valid;arch/arm/mach-iop13xx/msi.c +1
-1@@ -91,7 +91,7 @@ static void (*write_imipr[])(u32) = { write_imipr_3, }; -static void iop13xx_msi_handler (unsigned int irq,struct irq_desc *desc) +static void iop13xx_msi_handler (struct irq_desc *desc) {int i, j;unsigned long status;arch/arm/mach-lpc32xx/irq.c +2
-2@@ -370,7 +370,7 @@ static struct irq_chip lpc32xx_irq_chip = { .irq_set_wake = lpc32xx_irq_wake }; -static void lpc32xx_sic1_handler (unsigned int irq,struct irq_desc *desc) +static void lpc32xx_sic1_handler (struct irq_desc *desc) {unsigned long ints =__raw_readl (LPC32XX_INTC_STAT (LPC32XX_SIC1_BASE ));@@ -383,7 +383,7 @@ static void lpc32xx_sic1_handler(unsigned int irq, struct irq_desc *desc) } } -static void lpc32xx_sic2_handler (unsigned int irq,struct irq_desc *desc) +static void lpc32xx_sic2_handler (struct irq_desc *desc) {unsigned long ints =__raw_readl (LPC32XX_INTC_STAT (LPC32XX_SIC2_BASE ));arch/arm/mach-omap1/fpga.c +1
-1@@ -87,7 +87,7 @@ static void fpga_mask_ack_irq(struct irq_data *d)fpga_ack_irq (d); } -static void innovator_fpga_IRQ_demux (unsigned int irq,struct irq_desc *desc) +static void innovator_fpga_IRQ_demux (struct irq_desc *desc) {u32 stat;int fpga_irq;arch/arm/mach-omap2/prm_common.c +1
-1@@ -102,7 +102,7 @@ static void omap_prcm_events_filter_priority(unsigned long *events,* dispatched accordingly. Clearing of the wakeup events should be * done by the SoC specific individual handlers. */ -static void omap_prcm_irq_handler (unsigned int irq,struct irq_desc *desc) +static void omap_prcm_irq_handler (struct irq_desc *desc) {unsigned long pending[OMAP_PRCM_MAX_NR_PENDING_REG ];unsigned long priority_pending[OMAP_PRCM_MAX_NR_PENDING_REG ];arch/arm/mach-pxa/balloon3.c +2
-1@@ -496,8 +496,9 @@ static struct irq_chip balloon3_irq_chip = { .irq_unmask = balloon3_unmask_irq, }; -static void balloon3_irq_handler (unsigned int irq,struct irq_desc *desc) +static void balloon3_irq_handler (struct irq_desc *desc) { +unsigned int irq;unsigned long pending =__raw_readl (BALLOON3_INT_CONTROL_REG ) & balloon3_irq_enabled; do {arch/arm/mach-pxa/cm-x2xx-pci.c +2
-2@@ -29,12 +29,12 @@void __iomem *it8152_base_address;static int cmx2xx_it8152_irq_gpio; -static void cmx2xx_it8152_irq_demux (unsigned int irq,struct irq_desc *desc) +static void cmx2xx_it8152_irq_demux (struct irq_desc *desc) {/* clear our parent irq */ desc->irq_data.chip->irq_ack (&desc->irq_data); -it8152_irq_demux (irq, desc); +it8152_irq_demux (desc); }void __cmx2xx_pci_init_irq (int irq_gpio)arch/arm/mach-pxa/lpd270.c +2
-1@@ -120,9 +120,10 @@ static struct irq_chip lpd270_irq_chip = { .irq_unmask = lpd270_unmask_irq, }; -static void lpd270_irq_handler (unsigned int irq,struct irq_desc *desc) +static void lpd270_irq_handler (struct irq_desc *desc) {unsigned long pending; +unsigned int irq; pending =__raw_readw (LPD270_INT_STATUS ) & lpd270_irq_enabled; do {arch/arm/mach-pxa/pcm990-baseboard.c +1
-0@@ -287,6 +287,7 @@ static struct irq_chip pcm990_irq_chip = {static void pcm990_irq_handler (unsigned int irq,struct irq_desc *desc) {unsigned long pending; +unsigned int irq; pending = ~pcm990_cpld_readb (PCM990_CTRL_INTSETCLR ); pending &= pcm990_irq_enabled;arch/arm/mach-pxa/viper.c +2
-1@@ -276,9 +276,10 @@ static inline unsigned long viper_irq_pending(void) viper_irq_enabled_mask; } -static void viper_irq_handler (unsigned int irq,struct irq_desc *desc) +static void viper_irq_handler (struct irq_desc *desc) {unsigned long pending; +unsigned int irq; pending =viper_irq_pending (); do {arch/arm/mach-pxa/zeus.c +2
-1@@ -105,9 +105,10 @@ static inline unsigned long zeus_irq_pending(void)return __raw_readw (ZEUS_CPLD_ISA_IRQ ) & zeus_irq_enabled_mask; } -static void zeus_irq_handler (unsigned int irq,struct irq_desc *desc) +static void zeus_irq_handler (struct irq_desc *desc) {unsigned long pending; +unsigned int irq; pending =zeus_irq_pending (); do {arch/arm/mach-rpc/ecard.c +1
-1@@ -552,7 +552,7 @@ static void ecard_check_lockup(struct irq_desc *desc) }static void -ecard_irq_handler (unsigned int irq,struct irq_desc *desc) +ecard_irq_handler (struct irq_desc *desc) {ecard_t *ec;int called =0 ;arch/arm/mach-s3c64xx/common.c +4
-4@@ -389,22 +389,22 @@ static inline void s3c_irq_demux_eint(unsigned int start, unsigned int end) } } -static void s3c_irq_demux_eint0_3 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint0_3 (struct irq_desc *desc) {s3c_irq_demux_eint (0 ,3 ); } -static void s3c_irq_demux_eint4_11 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint4_11 (struct irq_desc *desc) {s3c_irq_demux_eint (4 ,11 ); } -static void s3c_irq_demux_eint12_19 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint12_19 (struct irq_desc *desc) {s3c_irq_demux_eint (12 ,19 ); } -static void s3c_irq_demux_eint20_27 (unsigned int irq,struct irq_desc *desc) +static void s3c_irq_demux_eint20_27 (struct irq_desc *desc) {s3c_irq_demux_eint (20 ,27 ); }arch/arm/mach-sa1100/neponset.c +1
-1@@ -166,7 +166,7 @@ static struct sa1100_port_fns neponset_port_fns = {* ensure that the IRQ signal is deasserted before returning. This * is rather unfortunate. */ -static void neponset_irq_handler (unsigned int irq,struct irq_desc *desc) +static void neponset_irq_handler (struct irq_desc *desc) {struct neponset_drvdata *d =irq_desc_get_handler_data (desc);unsigned int irr;arch/arm/plat-orion/gpio.c +1
-1@@ -407,7 +407,7 @@ static int gpio_irq_set_type(struct irq_data *d, u32 type)return 0 ; } -static void gpio_irq_handler (unsigned irq,struct irq_desc *desc) +static void gpio_irq_handler (struct irq_desc *desc) {struct orion_gpio_chip *ochip =irq_desc_get_handler_data (desc);u32 cause, type;Signature · 1 line
1.7.10.4
for the mach-gemini part
Signed-off-by Hans Ulli Kroll <[email protected]>
Robert Jarzmik
maintainerRe: [RFC v1 15/25] genirq: Kill the first parameter 'irq' of irq_flow_handler_t
In reply to Jiang Liuarch/arm/mach-pxa/pcm990-baseboard.c static struct irq_chip pcm990_irq_chip = { · line 290
Quoted 9 lines · Jiang Liu
arch/arm/mach-pxa/pcm990-baseboard.c +1
-0@@ -287,6 +287,7 @@ static struct irq_chip pcm990_irq_chip = {static void pcm990_irq_handler (unsigned int irq,struct irq_desc *desc) {unsigned long pending; +unsigned int irq;
That doesn't look good, double irq definition.
Cheers.
Signature · 1 line
Robert
RFC 16/25 genirq: Kill the first parameter 'irq' of irq_flow_handler_t
In reply to Jiang LiuNow most IRQ flow handlers make no use of the first parameter 'irq'. And for those who do make use of 'irq', we could easily get the irq number through irq_desc->irq_data->irq. So kill the first parameter 'irq' of irq_flow_handler_t.
To ease review, I have split the changes into several parts, though they should be merge as one to support bisecting.
Signed-off-by Jiang Liu <[email protected]>
--- arch/powerpc/include/asm/qe_ic.h | 23 +++++++++-------------- arch/powerpc/include/asm/tsi108_pci.h | 2 +- arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 4 +++- arch/powerpc/platforms/52xx/media5200.c | 2 +- arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +- arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 2 +- arch/powerpc/platforms/85xx/common.c | 2 +- arch/powerpc/platforms/85xx/mpc85xx_ds.c | 2 +- arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 3 ++- arch/powerpc/platforms/86xx/pic.c | 2 +- arch/powerpc/platforms/8xx/m8xx_setup.c | 2 +- arch/powerpc/platforms/cell/axon_msi.c | 2 +- arch/powerpc/platforms/cell/interrupt.c | 3 ++- arch/powerpc/platforms/cell/spider-pic.c | 2 +- arch/powerpc/platforms/chrp/setup.c | 2 +- arch/powerpc/platforms/embedded6xx/mvme5100.c | 2 +- arch/powerpc/platforms/pseries/setup.c | 2 +- arch/powerpc/sysdev/ge/ge_pic.c | 2 +- arch/powerpc/sysdev/mpic.c | 2 +- arch/powerpc/sysdev/qe_lib/qe_ic.c | 4 ++-- arch/powerpc/sysdev/tsi108_pci.c | 2 +- arch/powerpc/sysdev/uic.c | 2 +- arch/powerpc/sysdev/xilinx_intc.c | 2 +- 23 files changed, 36 insertions(+), 37 deletions(-)
arch/powerpc/include/asm/qe_ic.h +9 -14
@@ -59,14 +59,14 @@ enum qe_ic_grp_id {#ifdef CONFIG_QUICC_ENGINE void qe_ic_init (struct device_node *node,unsigned int flags, -void (*low_handler)(unsigned int irq,struct irq_desc *desc), -void (*high_handler)(unsigned int irq,struct irq_desc *desc)); +void (*low_handler)(struct irq_desc *desc), +void (*high_handler)(struct irq_desc *desc));unsigned int qe_ic_get_low_irq (struct qe_ic *qe_ic);unsigned int qe_ic_get_high_irq (struct qe_ic *qe_ic);#else static inline void qe_ic_init (struct device_node *node,unsigned int flags, -void (*low_handler)(unsigned int irq,struct irq_desc *desc), -void (*high_handler)(unsigned int irq,struct irq_desc *desc)) +void (*low_handler)(struct irq_desc *desc), +void (*high_handler)(struct irq_desc *desc)) {}static inline unsigned int qe_ic_get_low_irq (struct qe_ic *qe_ic) {return 0 ; }
@@ -78,8 +78,7 @@ void qe_ic_set_highest_priority(unsigned int virq, int high);int qe_ic_set_priority (unsigned int virq,unsigned int priority);int qe_ic_set_high_priority (unsigned int virq,unsigned int priority,int high); -static inline void qe_ic_cascade_low_ipic (unsigned int irq, -struct irq_desc *desc) +static inline void qe_ic_cascade_low_ipic (struct irq_desc *desc) {struct qe_ic *qe_ic =irq_desc_get_handler_data (desc);unsigned int cascade_irq =qe_ic_get_low_irq (qe_ic);
@@ -88,8 +87,7 @@ static inline void qe_ic_cascade_low_ipic(unsigned int irq,generic_handle_irq (cascade_irq); } -static inline void qe_ic_cascade_high_ipic (unsigned int irq, -struct irq_desc *desc) +static inline void qe_ic_cascade_high_ipic (struct irq_desc *desc) {struct qe_ic *qe_ic =irq_desc_get_handler_data (desc);unsigned int cascade_irq =qe_ic_get_high_irq (qe_ic);
@@ -98,8 +96,7 @@ static inline void qe_ic_cascade_high_ipic(unsigned int irq,generic_handle_irq (cascade_irq); } -static inline void qe_ic_cascade_low_mpic (unsigned int irq, -struct irq_desc *desc) +static inline void qe_ic_cascade_low_mpic (struct irq_desc *desc) {struct qe_ic *qe_ic =irq_desc_get_handler_data (desc);unsigned int cascade_irq =qe_ic_get_low_irq (qe_ic);
@@ -111,8 +108,7 @@ static inline void qe_ic_cascade_low_mpic(unsigned int irq, chip->irq_eoi (&desc->irq_data); } -static inline void qe_ic_cascade_high_mpic (unsigned int irq, -struct irq_desc *desc) +static inline void qe_ic_cascade_high_mpic (struct irq_desc *desc) {struct qe_ic *qe_ic =irq_desc_get_handler_data (desc);unsigned int cascade_irq =qe_ic_get_high_irq (qe_ic);
@@ -124,8 +120,7 @@ static inline void qe_ic_cascade_high_mpic(unsigned int irq, chip->irq_eoi (&desc->irq_data); } -static inline void qe_ic_cascade_muxed_mpic (unsigned int irq, -struct irq_desc *desc) +static inline void qe_ic_cascade_muxed_mpic (struct irq_desc *desc) {struct qe_ic *qe_ic =irq_desc_get_handler_data (desc);unsigned int cascade_irq;
arch/powerpc/include/asm/tsi108_pci.h +1 -1
@@ -39,7 +39,7 @@extern int tsi108_setup_pci (struct device_node *dev,u32 cfg_phys,int primary);extern void tsi108_pci_int_init (struct device_node *node); -extern void tsi108_irq_cascade (unsigned int irq,struct irq_desc *desc); +extern void tsi108_irq_cascade (struct irq_desc *desc);extern void tsi108_clear_pci_cfg_error (void );#endif /* _ASM_POWERPC_TSI108_PCI_H */
arch/powerpc/platforms/512x/mpc5121_ads_cpld.c +3 -1
@@ -105,8 +105,10 @@ cpld_pic_get_irq(int offset, u8 ignore, u8 __iomem *statusp, }static void -cpld_pic_cascade (unsigned int irq,struct irq_desc *desc) +cpld_pic_cascade (struct irq_desc *desc) { +unsigned int irq; + irq =cpld_pic_get_irq (0 ,PCI_IGNORE , &cpld_regs->pci_status, &cpld_regs->pci_mask);if (irq !=NO_IRQ ) {
arch/powerpc/platforms/52xx/media5200.c +1 -1
@@ -80,7 +80,7 @@ static struct irq_chip media5200_irq_chip = { .irq_mask_ack = media5200_irq_mask, }; -void media5200_irq_cascade (unsigned int virq,struct irq_desc *desc) +void media5200_irq_cascade (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);int sub_virq, val;
arch/powerpc/platforms/52xx/mpc52xx_gpt.c +1 -1
@@ -191,7 +191,7 @@ static struct irq_chip mpc52xx_gpt_irq_chip = { .irq_set_type = mpc52xx_gpt_irq_set_type, }; -void mpc52xx_gpt_irq_cascade (unsigned int virq,struct irq_desc *desc) +void mpc52xx_gpt_irq_cascade (struct irq_desc *desc) {struct mpc52xx_gpt_priv *gpt =irq_desc_get_handler_data (desc);int sub_virq;
arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +1 -1
@@ -78,7 +78,7 @@ static struct irq_chip pq2ads_pci_ic = { .irq_disable = pq2ads_pci_mask_irq }; -static void pq2ads_pci_irq_demux (unsigned int irq,struct irq_desc *desc) +static void pq2ads_pci_irq_demux (struct irq_desc *desc) {struct pq2ads_pci_pic *priv =irq_desc_get_handler_data (desc);u32 stat, mask, pend;
arch/powerpc/platforms/85xx/common.c +1 -1
@@ -49,7 +49,7 @@ int __init mpc85xx_common_publish_devices(void)return of_platform_bus_probe (NULL , mpc85xx_common_ids,NULL ); }#ifdef CONFIG_CPM2 -static void cpm2_cascade (unsigned int irq,struct irq_desc *desc) +static void cpm2_cascade (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);int cascade_irq;
arch/powerpc/platforms/85xx/mpc85xx_ds.c +1 -1
@@ -46,7 +46,7 @@#endif #ifdef CONFIG_PPC_I8259 -static void mpc85xx_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void mpc85xx_8259_cascade (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
arch/powerpc/platforms/85xx/socrates_fpga_pic.c +2 -1
@@ -91,8 +91,9 @@ static inline unsigned int socrates_fpga_pic_get_irq(unsigned int irq) (irq_hw_number_t)i); } -void socrates_fpga_pic_cascade (unsigned int irq,struct irq_desc *desc) +void socrates_fpga_pic_cascade (struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq;
arch/powerpc/platforms/86xx/pic.c +1 -1
@@ -17,7 +17,7 @@#include <asm/i8259.h> #ifdef CONFIG_PPC_I8259 -static void mpc86xx_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void mpc86xx_8259_cascade (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
arch/powerpc/platforms/8xx/m8xx_setup.c +1 -1
@@ -214,7 +214,7 @@ void mpc8xx_restart(char *cmd)panic ("Restart failed\n" ); } -static void cpm_cascade (unsigned int irq,struct irq_desc *desc) +static void cpm_cascade (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);int cascade_irq =cpm_get_irq ();
arch/powerpc/platforms/cell/axon_msi.c +1 -1
@@ -92,7 +92,7 @@ static void msic_dcr_write(struct axon_msic *msic, unsigned int dcr_n, u32 val)dcr_write (msic->dcr_host, dcr_n, val); } -static void axon_msi_cascade (unsigned int irq,struct irq_desc *desc) +static void axon_msi_cascade (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct axon_msic *msic =irq_desc_get_handler_data (desc);
arch/powerpc/platforms/cell/interrupt.c +2 -1
@@ -99,8 +99,9 @@ static void iic_ioexc_eoi(struct irq_data *d) { } -static void iic_ioexc_cascade (unsigned int irq,struct irq_desc *desc) +static void iic_ioexc_cascade (struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_chip *chip =irq_desc_get_chip (desc);struct cbe_iic_regs __iomem *node_iic = (void __iomem *)irq_desc_get_handler_data (desc);
arch/powerpc/platforms/cell/spider-pic.c +1 -1
@@ -199,7 +199,7 @@ static const struct irq_domain_ops spider_host_ops = { .xlate = spider_host_xlate, }; -static void spider_irq_cascade (unsigned int irq,struct irq_desc *desc) +static void spider_irq_cascade (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct spider_pic *pic =irq_desc_get_handler_data (desc);
arch/powerpc/platforms/chrp/setup.c +1 -1
@@ -363,7 +363,7 @@ void __init chrp_setup_arch(void)if (ppc_md.progress) ppc_md.progress ("Linux/PPC " UTS_RELEASE "\n" ,0x0 ); } -static void chrp_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void chrp_8259_cascade (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
arch/powerpc/platforms/embedded6xx/mvme5100.c +1 -1
@@ -42,7 +42,7 @@static phys_addr_t pci_membase;static u_char *restart; -static void mvme5100_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void mvme5100_8259_cascade (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
arch/powerpc/platforms/pseries/setup.c +1 -1
@@ -111,7 +111,7 @@ static void __init fwnmi_init(void) fwnmi_active =1 ; } -static void pseries_8259_cascade (unsigned int irq,struct irq_desc *desc) +static void pseries_8259_cascade (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
arch/powerpc/sysdev/ge/ge_pic.c +1 -1
@@ -91,7 +91,7 @@ static int gef_pic_cascade_irq;* should be masked out. */ -void gef_pic_cascade (unsigned int irq,struct irq_desc *desc) +void gef_pic_cascade (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq;
arch/powerpc/sysdev/mpic.c +1 -1
@@ -1180,7 +1180,7 @@ static int mpic_host_xlate(struct irq_domain *h, struct device_node *ct, }/* IRQ handler for a secondary MPIC cascaded from another IRQ controller */ -static void mpic_cascade (unsigned int irq,struct irq_desc *desc) +static void mpic_cascade (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct mpic *mpic =irq_desc_get_handler_data (desc);
arch/powerpc/sysdev/qe_lib/qe_ic.c +2 -2
@@ -310,8 +310,8 @@ unsigned int qe_ic_get_high_irq(struct qe_ic *qe_ic) }void __init qe_ic_init (struct device_node *node,unsigned int flags, -void (*low_handler)(unsigned int irq,struct irq_desc *desc), -void (*high_handler)(unsigned int irq,struct irq_desc *desc)) +void (*low_handler)(struct irq_desc *desc), +void (*high_handler)(struct irq_desc *desc)) {struct qe_ic *qe_ic;struct resource res;
arch/powerpc/sysdev/tsi108_pci.c +1 -1
@@ -428,7 +428,7 @@ void __init tsi108_pci_int_init(struct device_node *node)init_pci_source (); } -void tsi108_irq_cascade (unsigned int irq,struct irq_desc *desc) +void tsi108_irq_cascade (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =get_pci_source ();
arch/powerpc/sysdev/uic.c +1 -1
@@ -194,7 +194,7 @@ static struct irq_domain_ops uic_host_ops = { .xlate = irq_domain_xlate_twocell, }; -void uic_irq_cascade (unsigned int virq,struct irq_desc *desc) +void uic_irq_cascade (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct irq_data *idata =irq_desc_get_irq_data (desc);
arch/powerpc/sysdev/xilinx_intc.c +1 -1
@@ -222,7 +222,7 @@ int xilinx_intc_get_irq(void)/* * Support code for cascading to 8259 interrupt controllers */ -static void xilinx_i8259_cascade (unsigned int irq,struct irq_desc *desc) +static void xilinx_i8259_cascade (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);unsigned int cascade_irq =i8259_irq ();
Signature · 1 line
1.7.10.4
RFC 17/25 genirq: Kill the first parameter 'irq' of irq_flow_handler_t
In reply to Jiang LiuNow most IRQ flow handlers make no use of the first parameter 'irq'. And for those who do make use of 'irq', we could easily get the irq number through irq_desc->irq_data->irq. So kill the first parameter 'irq' of irq_flow_handler_t.
To ease review, I have split the changes into several parts, though they should be merge as one to support bisecting.
Signed-off-by Jiang Liu <[email protected]>
--- arch/mips/alchemy/common/irq.c | 4 ++-- arch/mips/alchemy/devboards/bcsr.c | 3 ++- arch/mips/ath25/ar2315.c | 2 +- arch/mips/ath25/ar5312.c | 2 +- arch/mips/ath79/irq.c | 11 +++++++---- arch/mips/cavium-octeon/octeon-irq.c | 8 ++++---- arch/mips/include/asm/netlogic/common.h | 4 ++-- arch/mips/jz4740/gpio.c | 2 +- arch/mips/netlogic/common/smp.c | 4 ++-- arch/mips/pci/pci-ar2315.c | 2 +- arch/mips/pci/pci-ar71xx.c | 2 +- arch/mips/pci/pci-ar724x.c | 2 +- arch/mips/pci/pci-rt3883.c | 3 ++- arch/mips/ralink/irq.c | 2 +- 14 files changed, 28 insertions(+), 23 deletions(-)
arch/mips/alchemy/common/irq.c +2 -2
@@ -851,7 +851,7 @@ static struct syscore_ops alchemy_gpic_pmops = {/* create chained handlers for the 4 IC requests to the MIPS IRQ ctrl */ #define DISP (name, base, addr) \ -static void au1000_##name##_dispatch(unsigned int irq, struct irq_desc *d) \ +static void au1000_##name##_dispatch(struct irq_desc *d) \ { \ unsigned long r = __raw_readl((void __iomem *)KSEG1ADDR(addr)); \ if (likely(r)) \
@@ -865,7 +865,7 @@ DISP(ic0r1, AU1000_INTC0_INT_BASE, AU1000_IC0_PHYS_ADDR + IC_REQ1INT) DISP(ic1r0, AU1000_INTC1_INT_BASE, AU1000_IC1_PHYS_ADDR + IC_REQ0INT) DISP(ic1r1, AU1000_INTC1_INT_BASE, AU1000_IC1_PHYS_ADDR + IC_REQ1INT) -static void alchemy_gpic_dispatch (unsigned int irq,struct irq_desc *d) +static void alchemy_gpic_dispatch (struct irq_desc *d) {int i =__raw_readl (AU1300_GPIC_ADDR +AU1300_GPIC_PRIENC );generic_handle_irq (ALCHEMY_GPIC_INT_BASE + i);
arch/mips/alchemy/devboards/bcsr.c +2 -1
@@ -85,8 +85,9 @@ EXPORT_SYMBOL_GPL(bcsr_mod);/* * DB1200/PB1200 CPLD IRQ muxer */ -static void bcsr_csc_handler (unsigned int irq,struct irq_desc *d) +static void bcsr_csc_handler (struct irq_desc *d) { +unsigned int irq =irq_desc_get_irq (d);unsigned short bisr =__raw_readw (bcsr_virt +BCSR_REG_INTSTAT );disable_irq_nosync (irq);
arch/mips/ath25/ar2315.c +1 -1
@@ -69,7 +69,7 @@ static struct irqaction ar2315_ahb_err_interrupt = { .name = "ar2315-ahb-error", }; -static void ar2315_misc_irq_handler (unsigned irq,struct irq_desc *desc) +static void ar2315_misc_irq_handler (struct irq_desc *desc) {u32 pending =ar2315_rst_reg_read (AR2315_ISR ) &ar2315_rst_reg_read (AR2315_IMR );
arch/mips/ath25/ar5312.c +1 -1
@@ -73,7 +73,7 @@ static struct irqaction ar5312_ahb_err_interrupt = { .name = "ar5312-ahb-error", }; -static void ar5312_misc_irq_handler (unsigned irq,struct irq_desc *desc) +static void ar5312_misc_irq_handler (struct irq_desc *desc) {u32 pending =ar5312_rst_reg_read (AR5312_ISR ) &ar5312_rst_reg_read (AR5312_IMR );
arch/mips/ath79/irq.c +7 -4
@@ -27,7 +27,7 @@static void (*ath79_ip2_handler)(void );static void (*ath79_ip3_handler)(void ); -static void ath79_misc_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ath79_misc_irq_handler (struct irq_desc *desc) {void __iomem *base = ath79_reset_base;u32 pending;
@@ -120,9 +120,10 @@ static void __init ath79_misc_irq_init(void)irq_set_chained_handler (ATH79_CPU_IRQ (6 ), ath79_misc_irq_handler); } -static void ar934x_ip2_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void ar934x_ip2_irq_dispatch (struct irq_desc *desc) {u32 status; +unsigned int irq =irq_desc_to_irq (desc);disable_irq_nosync (irq);
@@ -153,9 +154,10 @@ static void ar934x_ip2_irq_init(void)irq_set_chained_handler (ATH79_CPU_IRQ (2 ), ar934x_ip2_irq_dispatch); } -static void qca955x_ip2_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void qca955x_ip2_irq_dispatch (struct irq_desc *desc) {u32 status; +unsigned int irq =irq_desc_to_irq (desc);disable_irq_nosync (irq);
@@ -181,9 +183,10 @@ enable:enable_irq (irq); } -static void qca955x_ip3_irq_dispatch (unsigned int irq,struct irq_desc *desc) +static void qca955x_ip3_irq_dispatch (struct irq_desc *desc) {u32 status; +unsigned int irq =irq_desc_to_irq (desc);disable_irq_nosync (irq);
arch/mips/cavium-octeon/octeon-irq.c +4 -4
@@ -697,14 +697,14 @@ static void octeon_irq_ciu_gpio_ack(struct irq_data *data)cvmx_write_csr (CVMX_GPIO_INT_CLR , mask); } -static void octeon_irq_handle_trigger (unsigned int irq,struct irq_desc *desc) +static void octeon_irq_handle_trigger (struct irq_desc *desc) {struct irq_data *data =irq_desc_get_irq_data (desc);if (irqd_get_trigger_type (data) &IRQ_TYPE_EDGE_BOTH ) -handle_edge_irq (irq, desc); +handle_edge_irq (desc);else -handle_level_irq (irq, desc); +handle_level_irq (desc); }#ifdef CONFIG_SMP
@@ -2221,7 +2221,7 @@ static irqreturn_t octeon_irq_cib_handler(int my_irq, void *data)if (irqd_get_trigger_type (irq_data) &IRQ_TYPE_EDGE_BOTH )cvmx_write_csr (host_data->raw_reg,1ull << i); -generic_handle_irq_desc (irq, desc); +generic_handle_irq_desc (desc); } }
arch/mips/include/asm/netlogic/common.h +2 -2
@@ -57,8 +57,8 @@#include <asm/mach-netlogic/multi-node.h> struct irq_desc ; -void nlm_smp_function_ipi_handler (unsigned int irq,struct irq_desc *desc); -void nlm_smp_resched_ipi_handler (unsigned int irq,struct irq_desc *desc); +void nlm_smp_function_ipi_handler (struct irq_desc *desc); +void nlm_smp_resched_ipi_handler (struct irq_desc *desc);void nlm_smp_irq_init (int hwcpuid);void nlm_boot_secondary_cpus (void );int nlm_wakeup_secondary_cpus (void );
arch/mips/jz4740/gpio.c +1 -1
@@ -297,7 +297,7 @@ static void jz_gpio_check_trigger_both(struct jz_gpio_chip *chip, unsigned int iwritel (mask, reg); } -static void jz_gpio_irq_demux_handler (unsigned int irq,struct irq_desc *desc) +static void jz_gpio_irq_demux_handler (struct irq_desc *desc) {uint32_t flag;unsigned int gpio_irq;
arch/mips/netlogic/common/smp.c +2 -2
@@ -82,7 +82,7 @@ void nlm_send_ipi_mask(const struct cpumask *mask, unsigned int action) }/* IRQ_IPI_SMP_FUNCTION Handler */ -void nlm_smp_function_ipi_handler (unsigned int irq,struct irq_desc *desc) +void nlm_smp_function_ipi_handler (struct irq_desc *desc) {clear_c0_eimr (irq);ack_c0_eirr (irq);
@@ -91,7 +91,7 @@ void nlm_smp_function_ipi_handler(unsigned int irq, struct irq_desc *desc) }/* IRQ_IPI_SMP_RESCHEDULE handler */ -void nlm_smp_resched_ipi_handler (unsigned int irq,struct irq_desc *desc) +void nlm_smp_resched_ipi_handler (struct irq_desc *desc) {clear_c0_eimr (irq);ack_c0_eirr (irq);
arch/mips/pci/pci-ar2315.c +1 -1
@@ -318,7 +318,7 @@ static int ar2315_pci_host_setup(struct ar2315_pci_ctrl *apc)return 0 ; } -static void ar2315_pci_irq_handler (unsigned irq,struct irq_desc *desc) +static void ar2315_pci_irq_handler (struct irq_desc *desc) {struct ar2315_pci_ctrl *apc =irq_desc_get_handler_data (desc); u32 pending = ar2315_pci_reg_read(apc, AR2315_PCI_ISR) &
arch/mips/pci/pci-ar71xx.c +1 -1
@@ -226,7 +226,7 @@ static struct pci_ops ar71xx_pci_ops = { .write = ar71xx_pci_write_config, }; -static void ar71xx_pci_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ar71xx_pci_irq_handler (struct irq_desc *desc) {struct ar71xx_pci_controller *apc;void __iomem *base = ath79_reset_base;
arch/mips/pci/pci-ar724x.c +1 -1
@@ -225,7 +225,7 @@ static struct pci_ops ar724x_pci_ops = { .write = ar724x_pci_write, }; -static void ar724x_pci_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ar724x_pci_irq_handler (struct irq_desc *desc) {struct ar724x_pci_controller *apc;void __iomem *base;
arch/mips/pci/pci-rt3883.c +2 -1
@@ -129,7 +129,7 @@ static void rt3883_pci_write_cfg32(struct rt3883_pci_controller *rpc,rt3883_pci_w32 (rpc, val,RT3883_PCI_REG_CFGDATA ); } -static void rt3883_pci_irq_handler (unsigned int irq,struct irq_desc *desc) +static void rt3883_pci_irq_handler (struct irq_desc *desc) {struct rt3883_pci_controller *rpc;u32 pending;
@@ -145,6 +145,7 @@ static void rt3883_pci_irq_handler(unsigned int irq, struct irq_desc *desc) }while (pending) { +unsigned int irq;unsigned bit =__ffs (pending); irq =irq_find_mapping (rpc->irq_domain, bit);
arch/mips/ralink/irq.c +1 -1
@@ -95,7 +95,7 @@ unsigned int get_c0_compare_int(void)return CP0_LEGACY_COMPARE_IRQ ; } -static void ralink_intc_irq_handler (unsigned int irq,struct irq_desc *desc) +static void ralink_intc_irq_handler (struct irq_desc *desc) {u32 pending =rt_intc_r32 (INTC_REG_STATUS0 );
Signature · 1 line
1.7.10.4
RFC 18/25 genirq: Kill the first parameter 'irq' of irq_flow_handler_t
In reply to Jiang LiuNow most IRQ flow handlers make no use of the first parameter 'irq'. And for those who do make use of 'irq', we could easily get the irq number through irq_desc->irq_data->irq. So kill the first parameter 'irq' of irq_flow_handler_t.
To ease review, I have split the changes into several parts, though they should be merge as one to support bisecting.
Signed-off-by Jiang Liu <[email protected]>
--- arch/m68k/amiga/amiints.c | 8 ++++---- arch/m68k/coldfire/intc-5272.c | 4 ++-- arch/m68k/include/asm/mac_via.h | 2 +- arch/m68k/mac/baboon.c | 2 +- arch/m68k/mac/oss.c | 4 ++-- arch/m68k/mac/psc.c | 3 ++- arch/m68k/mac/via.c | 6 +++--- 7 files changed, 15 insertions(+), 14 deletions(-)
arch/m68k/amiga/amiints.c +4 -4
@@ -46,7 +46,7 @@ static struct irq_chip amiga_irq_chip = {* The builtin Amiga hardware interrupt handlers. */ -static void ami_int1 (unsigned int irq,struct irq_desc *desc) +static void ami_int1 (struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
@@ -69,7 +69,7 @@ static void ami_int1(unsigned int irq, struct irq_desc *desc) } } -static void ami_int3 (unsigned int irq,struct irq_desc *desc) +static void ami_int3 (struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
@@ -92,7 +92,7 @@ static void ami_int3(unsigned int irq, struct irq_desc *desc) } } -static void ami_int4 (unsigned int irq,struct irq_desc *desc) +static void ami_int4 (struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
@@ -121,7 +121,7 @@ static void ami_int4(unsigned int irq, struct irq_desc *desc) } } -static void ami_int5 (unsigned int irq,struct irq_desc *desc) +static void ami_int5 (struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
arch/m68k/coldfire/intc-5272.c +2 -2
@@ -143,10 +143,10 @@ static int intc_irq_set_type(struct irq_data *d, unsigned int type)* We need to be careful with the masking/acking due to the side effects * of masking an interrupt. */ -static void intc_external_irq (unsigned int irq,struct irq_desc *desc) +static void intc_external_irq (struct irq_desc *desc) {irq_desc_get_chip (desc)->irq_ack (&desc->irq_data); -handle_simple_irq (irq, desc); +handle_simple_irq (desc); }static struct irq_chip intc_irq_chip = {
arch/m68k/include/asm/mac_via.h +1 -1
@@ -261,7 +261,7 @@ extern void via_irq_enable(int);extern void via_irq_disable (int );extern void via_nubus_irq_startup (int irq);extern void via_nubus_irq_shutdown (int irq); -extern void via1_irq (unsigned int irq,struct irq_desc *desc); +extern void via1_irq (struct irq_desc *desc);extern void via1_set_head (int );extern int via2_scsi_drq_pending (void );
arch/m68k/mac/baboon.c +1 -1
@@ -45,7 +45,7 @@ void __init baboon_init(void)* Baboon interrupt handler. This works a lot like a VIA. */ -static void baboon_irq (unsigned int irq,struct irq_desc *desc) +static void baboon_irq (struct irq_desc *desc) {int irq_bit, irq_num;unsigned char events;
arch/m68k/mac/oss.c +2 -2
@@ -63,7 +63,7 @@ void __init oss_nubus_init(void)* Handle miscellaneous OSS interrupts. */ -static void oss_irq (unsigned int irq,struct irq_desc *desc) +static void oss_irq (struct irq_desc *desc) {int events = oss->irq_pending & (OSS_IP_IOPSCC |OSS_IP_SCSI |OSS_IP_IOPISM );
@@ -97,7 +97,7 @@ static void oss_irq(unsigned int irq, struct irq_desc *desc)* Unlike the VIA/RBV this is on its own autovector interrupt level. */ -static void oss_nubus_irq (unsigned int irq,struct irq_desc *desc) +static void oss_nubus_irq (struct irq_desc *desc) {int events, irq_bit, i;
arch/m68k/mac/psc.c +2 -1
@@ -113,8 +113,9 @@ void __init psc_init(void)* PSC interrupt handler. It's a lot like the VIA interrupt handler. */ -static void psc_irq (unsigned int irq,struct irq_desc *desc) +static void psc_irq (struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);unsigned int offset = (unsigned int )irq_desc_get_handler_data (desc);int pIFR = pIFRbase + offset;int pIER = pIERbase + offset;
arch/m68k/mac/via.c +3 -3
@@ -446,7 +446,7 @@ void via_nubus_irq_shutdown(int irq)* via6522.c :-), disable/pending masks added. */ -void via1_irq (unsigned int irq,struct irq_desc *desc) +void via1_irq (struct irq_desc *desc) {int irq_num;unsigned char irq_bit, events;
@@ -467,7 +467,7 @@ void via1_irq(unsigned int irq, struct irq_desc *desc) }while (events >= irq_bit); } -static void via2_irq (unsigned int irq,struct irq_desc *desc) +static void via2_irq (struct irq_desc *desc) {int irq_num;unsigned char irq_bit, events;
@@ -493,7 +493,7 @@ static void via2_irq(unsigned int irq, struct irq_desc *desc)* VIA2 dispatcher as a fast interrupt handler. */ -void via_nubus_irq (unsigned int irq,struct irq_desc *desc) +void via_nubus_irq (struct irq_desc *desc) {int slot_irq;unsigned char slot_bit, events;
Signature · 1 line
1.7.10.4
RFC 18/25 genirq: Kill the first parameter 'irq' of irq_flow_handler_t
In reply to Jiang LiuNow most IRQ flow handlers make no use of the first parameter 'irq'. And for those who do make use of 'irq', we could easily get the irq number through irq_desc->irq_data->irq. So kill the first parameter 'irq' of irq_flow_handler_t.
To ease review, I have split the changes into several parts, though they should be merge as one to support bisecting.
Signed-off-by Jiang Liu <[email protected]>
--- arch/m68k/amiga/amiints.c | 8 ++++---- arch/m68k/coldfire/intc-5272.c | 4 ++-- arch/m68k/include/asm/mac_via.h | 2 +- arch/m68k/mac/baboon.c | 2 +- arch/m68k/mac/oss.c | 4 ++-- arch/m68k/mac/psc.c | 3 ++- arch/m68k/mac/via.c | 6 +++--- 7 files changed, 15 insertions(+), 14 deletions(-)
arch/m68k/amiga/amiints.c +4 -4
@@ -46,7 +46,7 @@ static struct irq_chip amiga_irq_chip = {* The builtin Amiga hardware interrupt handlers. */ -static void ami_int1 (unsigned int irq,struct irq_desc *desc) +static void ami_int1 (struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
@@ -69,7 +69,7 @@ static void ami_int1(unsigned int irq, struct irq_desc *desc) } } -static void ami_int3 (unsigned int irq,struct irq_desc *desc) +static void ami_int3 (struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
@@ -92,7 +92,7 @@ static void ami_int3(unsigned int irq, struct irq_desc *desc) } } -static void ami_int4 (unsigned int irq,struct irq_desc *desc) +static void ami_int4 (struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
@@ -121,7 +121,7 @@ static void ami_int4(unsigned int irq, struct irq_desc *desc) } } -static void ami_int5 (unsigned int irq,struct irq_desc *desc) +static void ami_int5 (struct irq_desc *desc) {unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
arch/m68k/coldfire/intc-5272.c +2 -2
@@ -143,10 +143,10 @@ static int intc_irq_set_type(struct irq_data *d, unsigned int type)* We need to be careful with the masking/acking due to the side effects * of masking an interrupt. */ -static void intc_external_irq (unsigned int irq,struct irq_desc *desc) +static void intc_external_irq (struct irq_desc *desc) {irq_desc_get_chip (desc)->irq_ack (&desc->irq_data); -handle_simple_irq (irq, desc); +handle_simple_irq (desc); }static struct irq_chip intc_irq_chip = {
arch/m68k/include/asm/mac_via.h +1 -1
@@ -261,7 +261,7 @@ extern void via_irq_enable(int);extern void via_irq_disable (int );extern void via_nubus_irq_startup (int irq);extern void via_nubus_irq_shutdown (int irq); -extern void via1_irq (unsigned int irq,struct irq_desc *desc); +extern void via1_irq (struct irq_desc *desc);extern void via1_set_head (int );extern int via2_scsi_drq_pending (void );
arch/m68k/mac/baboon.c +1 -1
@@ -45,7 +45,7 @@ void __init baboon_init(void)* Baboon interrupt handler. This works a lot like a VIA. */ -static void baboon_irq (unsigned int irq,struct irq_desc *desc) +static void baboon_irq (struct irq_desc *desc) {int irq_bit, irq_num;unsigned char events;
arch/m68k/mac/oss.c +2 -2
@@ -63,7 +63,7 @@ void __init oss_nubus_init(void)* Handle miscellaneous OSS interrupts. */ -static void oss_irq (unsigned int irq,struct irq_desc *desc) +static void oss_irq (struct irq_desc *desc) {int events = oss->irq_pending & (OSS_IP_IOPSCC |OSS_IP_SCSI |OSS_IP_IOPISM );
@@ -97,7 +97,7 @@ static void oss_irq(unsigned int irq, struct irq_desc *desc)* Unlike the VIA/RBV this is on its own autovector interrupt level. */ -static void oss_nubus_irq (unsigned int irq,struct irq_desc *desc) +static void oss_nubus_irq (struct irq_desc *desc) {int events, irq_bit, i;
arch/m68k/mac/psc.c +2 -1
@@ -113,8 +113,9 @@ void __init psc_init(void)* PSC interrupt handler. It's a lot like the VIA interrupt handler. */ -static void psc_irq (unsigned int irq,struct irq_desc *desc) +static void psc_irq (struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);unsigned int offset = (unsigned int )irq_desc_get_handler_data (desc);int pIFR = pIFRbase + offset;int pIER = pIERbase + offset;
arch/m68k/mac/via.c +3 -3
@@ -446,7 +446,7 @@ void via_nubus_irq_shutdown(int irq)* via6522.c :-), disable/pending masks added. */ -void via1_irq (unsigned int irq,struct irq_desc *desc) +void via1_irq (struct irq_desc *desc) {int irq_num;unsigned char irq_bit, events;
@@ -467,7 +467,7 @@ void via1_irq(unsigned int irq, struct irq_desc *desc) }while (events >= irq_bit); } -static void via2_irq (unsigned int irq,struct irq_desc *desc) +static void via2_irq (struct irq_desc *desc) {int irq_num;unsigned char irq_bit, events;
@@ -493,7 +493,7 @@ static void via2_irq(unsigned int irq, struct irq_desc *desc)* VIA2 dispatcher as a fast interrupt handler. */ -void via_nubus_irq (unsigned int irq,struct irq_desc *desc) +void via_nubus_irq (struct irq_desc *desc) {int slot_irq;unsigned char slot_bit, events;
Signature · 1 line
1.7.10.4
RFC 19/25 genirq: Kill the first parameter 'irq' of irq_flow_handler_t
In reply to Jiang LiuNow most IRQ flow handlers make no use of the first parameter 'irq'. And for those who do make use of 'irq', we could easily get the irq number through irq_desc->irq_data->irq. So kill the first parameter 'irq' of irq_flow_handler_t.
To ease review, I have split the changes into several parts, though they should be merge as one to support bisecting.
Signed-off-by Jiang Liu <[email protected]>
--- arch/sh/boards/mach-se/7343/irq.c | 4 ++-- arch/sh/boards/mach-se/7722/irq.c | 3 ++- arch/sh/boards/mach-se/7724/irq.c | 3 ++- arch/sh/boards/mach-x3proto/gpio.c | 4 ++-- arch/sh/cchips/hd6446x/hd64461.c | 2 +- drivers/sh/intc/core.c | 4 ++-- drivers/sh/intc/virq.c | 5 +++-- 7 files changed, 14 insertions(+), 11 deletions(-)
arch/sh/boards/mach-se/7343/irq.c +2 -2
@@ -29,9 +29,9 @@static void __iomem *se7343_irq_regs;struct irq_domain *se7343_irq_domain; -static void se7343_irq_demux (unsigned int irq,struct irq_desc *desc) +static void se7343_irq_demux (struct irq_desc *desc) { -struct irq_data *data =irq_get_irq_data (irq); +struct irq_data *data =irq_desc_get_irq_data (desc);struct irq_chip *chip =irq_data_get_irq_chip (data);unsigned long mask;int bit;
arch/sh/boards/mach-se/7722/irq.c +2 -1
@@ -28,8 +28,9 @@static void __iomem *se7722_irq_regs;struct irq_domain *se7722_irq_domain; -static void se7722_irq_demux (unsigned int irq,struct irq_desc *desc) +static void se7722_irq_demux (struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_data *data =irq_get_irq_data (irq);struct irq_chip *chip =irq_data_get_irq_chip (data);unsigned long mask;
arch/sh/boards/mach-se/7724/irq.c +2 -1
@@ -92,8 +92,9 @@ static struct irq_chip se7724_irq_chip __read_mostly = { .irq_unmask = enable_se7724_irq, }; -static void se7724_irq_demux (unsigned int irq,struct irq_desc *desc) +static void se7724_irq_demux (struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct fpga_irq set =get_fpga_irq (irq);unsigned short intv =__raw_readw (set.sraddr);unsigned int ext_irq = set.base;
arch/sh/boards/mach-x3proto/gpio.c +2 -2
@@ -60,9 +60,9 @@ static int x3proto_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)return virq; } -static void x3proto_gpio_irq_handler (unsigned int irq,struct irq_desc *desc) +static void x3proto_gpio_irq_handler (struct irq_desc *desc) { -struct irq_data *data =irq_get_irq_data (irq); +struct irq_data *data =irq_desc_get_irq_data (desc);struct irq_chip *chip =irq_data_get_irq_chip (data);unsigned long mask;int pin;
arch/sh/cchips/hd6446x/hd64461.c +1 -1
@@ -56,7 +56,7 @@ static struct irq_chip hd64461_irq_chip = { .irq_unmask = hd64461_unmask_irq, }; -static void hd64461_irq_demux (unsigned int irq,struct irq_desc *desc) +static void hd64461_irq_demux (struct irq_desc *desc) {unsigned short intv =__raw_readw (HD64461_NIRR );unsigned int ext_irq =HD64461_IRQBASE ;
drivers/sh/intc/core.c +2 -2
@@ -65,9 +65,9 @@ void intc_set_prio_level(unsigned int irq, unsigned int level)raw_spin_unlock_irqrestore (&intc_big_lock, flags); } -static void intc_redirect_irq (unsigned int irq,struct irq_desc *desc) +static void intc_redirect_irq (struct irq_desc *desc) { -generic_handle_irq_desc (irq, desc); +generic_handle_irq_desc (desc); } static void __init intc_register_irq(struct intc_desc *desc,
drivers/sh/intc/virq.c +3 -2
@@ -107,8 +107,9 @@ static int add_virq_to_pirq(unsigned int irq, unsigned int virq)return 0 ; } -static void intc_virq_handler (unsigned int irq,struct irq_desc *desc) +static void intc_virq_handler (struct irq_desc *desc) { +unsigned int irq =irq_desc_get_irq (desc);struct irq_data *data =irq_desc_get_irq_data (desc);struct irq_chip *chip =irq_data_get_irq_chip (data);struct intc_virq_list *entry, *vlist =irq_data_get_irq_handler_data (data);
@@ -124,7 +125,7 @@ static void intc_virq_handler(unsigned int irq, struct irq_desc *desc) handle = (unsigned long )irq_desc_get_handler_data (vdesc); addr =INTC_REG (d,_INTC_ADDR_E (handle),0 );if (intc_reg_fns[_INTC_FN (handle)](addr, handle,0 )) -generic_handle_irq_desc (entry->irq, vdesc); +generic_handle_irq_desc (vdesc); } }
Signature · 1 line
1.7.10.4
RFC 20/25 genirq: Kill the first parameter 'irq' of irq_flow_handler_t
In reply to Jiang LiuNow most IRQ flow handlers make no use of the first parameter 'irq'. And for those who do make use of 'irq', we could easily get the irq number through irq_desc->irq_data->irq. So kill the first parameter 'irq' of irq_flow_handler_t.
To ease review, I have split the changes into several parts, though they should be merge as one to support bisecting.
Signed-off-by Jiang Liu <[email protected]>
--- arch/alpha/kernel/irq.c | 2 +- arch/avr32/mach-at32ap/extint.c | 2 +- arch/avr32/mach-at32ap/pio.c | 2 +- arch/blackfin/kernel/ipipe.c | 4 ++-- arch/c6x/platforms/megamod-pic.c | 3 ++- arch/sparc/kernel/leon_kernel.c | 2 +- arch/sparc/kernel/leon_pci_grpci1.c | 2 +- arch/sparc/kernel/leon_pci_grpci2.c | 2 +- arch/tile/kernel/pci_gx.c | 4 ++-- arch/unicore32/kernel/irq.c | 3 ++- arch/x86/kernel/irq_64.c | 2 +- arch/x86/lguest/boot.c | 2 +- 12 files changed, 16 insertions(+), 14 deletions(-)
arch/alpha/kernel/irq.c +1 -1
@@ -118,6 +118,6 @@ handle_irq(int irq) }irq_enter (); -generic_handle_irq_desc (irq, desc); +generic_handle_irq_desc (desc);irq_exit (); }
arch/avr32/mach-at32ap/extint.c +1 -1
@@ -144,7 +144,7 @@ static struct irq_chip eic_chip = { .irq_set_type = eic_set_irq_type, }; -static void demux_eic_irq (unsigned int irq,struct irq_desc *desc) +static void demux_eic_irq (struct irq_desc *desc) {struct eic *eic =irq_desc_get_handler_data (desc);unsigned long status, pending;
arch/avr32/mach-at32ap/pio.c +1 -1
@@ -281,7 +281,7 @@ static struct irq_chip gpio_irqchip = { .irq_set_type = gpio_irq_type, }; -static void gpio_irq_handler (unsigned irq,struct irq_desc *desc) +static void gpio_irq_handler (struct irq_desc *desc) {struct pio_device *pio =irq_desc_get_chip_data (desc);unsigned gpio_irq;
arch/blackfin/kernel/ipipe.c +2 -2
@@ -54,9 +54,9 @@ atomic_t __ipipe_irq_lvdepth[IVG15 + 1];unsigned long __ipipe_irq_lvmask = bfin_no_irqs;EXPORT_SYMBOL (__ipipe_irq_lvmask); -static void __ipipe_ack_irq (unsigned irq,struct irq_desc *desc) +static void __ipipe_ack_irq (struct irq_desc *desc) { - desc->ipipe_ack (irq, desc); + desc->ipipe_ack (irq_desc_get_irq (desc), desc); }/*
arch/c6x/platforms/megamod-pic.c +2 -1
@@ -93,12 +93,13 @@ static struct irq_chip megamod_chip = { .irq_unmask = unmask_megamod, }; -static void megamod_irq_cascade (unsigned int irq,struct irq_desc *desc) +static void megamod_irq_cascade (struct irq_desc *desc) {struct megamod_cascade_data *cascade;struct megamod_pic *pic;u32 events;int n, idx; +unsigned int irq; cascade =irq_desc_get_handler_data (desc);
arch/sparc/kernel/leon_kernel.c +1 -1
@@ -53,7 +53,7 @@ static inline unsigned int leon_eirq_get(int cpu) }/* Handle one or multiple IRQs from the extended interrupt controller */ -static void leon_handle_ext_irq (unsigned int irq,struct irq_desc *desc) +static void leon_handle_ext_irq (struct irq_desc *desc) {unsigned int eirq;struct irq_bucket *p;
arch/sparc/kernel/leon_pci_grpci1.c +1 -1
@@ -357,7 +357,7 @@ static struct irq_chip grpci1_irq = { };/* Handle one or multiple IRQs from the PCI core */ -static void grpci1_pci_flow_irq (unsigned int irq,struct irq_desc *desc) +static void grpci1_pci_flow_irq (struct irq_desc *desc) {struct grpci1_priv *priv = grpci1priv;int i, ack =0 ;
arch/sparc/kernel/leon_pci_grpci2.c +1 -1
@@ -498,7 +498,7 @@ static struct irq_chip grpci2_irq = { };/* Handle one or multiple IRQs from the PCI core */ -static void grpci2_pci_flow_irq (unsigned int irq,struct irq_desc *desc) +static void grpci2_pci_flow_irq (struct irq_desc *desc) {struct grpci2_priv *priv = grpci2priv;int i, ack =0 ;
arch/tile/kernel/pci_gx.c +2 -2
@@ -304,7 +304,7 @@ static struct irq_chip tilegx_legacy_irq_chip = {* to Linux which just calls handle_level_irq() after clearing the * MAC INTx Assert status bit associated with this interrupt. */ -static void trio_handle_level_irq (unsigned int irq,struct irq_desc *desc) +static void trio_handle_level_irq (struct irq_desc *desc) {struct pci_controller *controller =irq_desc_get_handler_data (desc);gxio_trio_context_t *trio_context = controller->trio;
@@ -313,7 +313,7 @@ static void trio_handle_level_irq(unsigned int irq, struct irq_desc *desc)unsigned int reg_offset;uint64_t level_mask; -handle_level_irq (irq, desc); +handle_level_irq (desc);/* * Clear the INTx Level status, otherwise future interrupts are
arch/unicore32/kernel/irq.c +2 -1
@@ -113,9 +113,10 @@ static struct irq_chip puv3_low_gpio_chip = {* and call the handler. */ static void -puv3_gpio_handler (unsigned int irq,struct irq_desc *desc) +puv3_gpio_handler (struct irq_desc *desc) {unsigned int mask; +unsigned int irq; mask =readl (GPIO_GEDR ); do {
arch/x86/kernel/irq_64.c +1 -1
@@ -78,6 +78,6 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)if (unlikely (!desc))return false; -generic_handle_irq_desc (irq, desc); +generic_handle_irq_desc (desc);return true; }
arch/x86/lguest/boot.c +1 -1
@@ -1021,7 +1021,7 @@ static struct clock_event_device lguest_clockevent = {* This is the Guest timer interrupt handler (hardware interrupt 0). We just * call the clockevent infrastructure and it does whatever needs doing. */ -static void lguest_time_irq (unsigned int irq,struct irq_desc *desc) +static void lguest_time_irq (struct irq_desc *desc) {unsigned long flags;
Signature · 1 line
1.7.10.4