commit 52afddf59be0049d4118b21bdb1ef6bd1c5a9165
Author: Jeff Garzik <jeff@garzik.org>
Date:   Fri Oct 19 00:48:47 2007 -0400

    [IRQ ARG REMOVAL] trivial driver updates

 drivers/acpi/osl.c                         |    2 +-
 drivers/ata/ahci.c                         |    2 +-
 drivers/ata/libata-core.c                  |    2 +-
 drivers/ata/pdc_adma.c                     |    2 +-
 drivers/ata/sata_inic162x.c                |    2 +-
 drivers/ata/sata_mv.c                      |    2 +-
 drivers/ata/sata_nv.c                      |   20 ++++++++++----------
 drivers/ata/sata_promise.c                 |    2 +-
 drivers/ata/sata_qstor.c                   |    2 +-
 drivers/ata/sata_sil.c                     |    2 +-
 drivers/ata/sata_sil24.c                   |    2 +-
 drivers/ata/sata_sx4.c                     |    2 +-
 drivers/ata/sata_vsc.c                     |    2 +-
 drivers/atm/eni.c                          |    2 +-
 drivers/atm/firestream.c                   |    2 +-
 drivers/atm/fore200e.c                     |    2 +-
 drivers/atm/he.c                           |    4 ++--
 drivers/atm/idt77252.c                     |    2 +-
 drivers/atm/iphase.c                       |    2 +-
 drivers/atm/lanai.c                        |    2 +-
 drivers/atm/nicstar.c                      |    4 ++--
 drivers/atm/zatm.c                         |    2 +-
 drivers/block/DAC960.c                     |   21 +++++++--------------
 drivers/block/DAC960.h                     |   12 ++++++------
 drivers/block/amiflop.c                    |    4 ++--
 drivers/block/ataflop.c                    |    4 ++--
 drivers/block/cciss.c                      |    6 +++---
 drivers/block/cpqarray.c                   |    4 ++--
 drivers/block/floppy.c                     |    4 ++--
 drivers/block/lguest_blk.c                 |    2 +-
 drivers/block/ps2esdi.c                    |    4 ++--
 drivers/block/swim3.c                      |    8 ++++----
 drivers/block/sx8.c                        |    2 +-
 drivers/block/umem.c                       |    2 +-
 drivers/block/xd.c                         |    2 +-
 drivers/block/xd.h                         |    2 +-
 drivers/block/xen-blkfront.c               |    2 +-
 drivers/char/amiserial.c                   |    6 +++---
 drivers/char/applicom.c                    |    4 ++--
 drivers/char/drm/drm_os_linux.h            |    2 +-
 drivers/char/esp.c                         |    2 +-
 drivers/char/hpet.c                        |    2 +-
 drivers/char/hvc_console.c                 |    2 +-
 drivers/char/hvcs.c                        |    4 ++--
 drivers/char/hvsi.c                        |    2 +-
 drivers/char/ipmi/ipmi_si_intf.c           |    6 +++---
 drivers/char/isicom.c                      |    2 +-
 drivers/char/mbcs.c                        |    3 +--
 drivers/char/mmtimer.c                     |    3 +--
 drivers/char/mxser.c                       |    4 ++--
 drivers/char/mxser_new.c                   |    2 +-
 drivers/char/nwbutton.c                    |    2 +-
 drivers/char/nwbutton.h                    |    2 +-
 drivers/char/rtc.c                         |    6 +++---
 drivers/char/ser_a2232.c                   |    4 ++--
 drivers/char/serial167.c                   |    6 +++---
 drivers/char/snsc.c                        |    2 +-
 drivers/char/snsc_event.c                  |    2 +-
 drivers/char/sonypi.c                      |    2 +-
 drivers/char/tlclk.c                       |    4 ++--
 drivers/char/vme_scc.c                     |   16 ++++++++--------
 drivers/dma/ioat_dma.c                     |    4 ++--
 drivers/fc4/soc.c                          |    2 +-
 drivers/fc4/socal.c                        |    2 +-
 drivers/firewire/fw-ohci.c                 |    2 +-
 drivers/i2c/busses/i2c-elektor.c           |    2 +-
 drivers/i2c/busses/i2c-ibm_iic.c           |    2 +-
 drivers/i2c/busses/i2c-iop3xx.c            |    2 +-
 drivers/i2c/busses/i2c-mpc.c               |    2 +-
 drivers/i2c/busses/i2c-mv64xxx.c           |    2 +-
 drivers/i2c/busses/i2c-ocores.c            |    2 +-
 drivers/i2c/busses/i2c-omap.c              |    2 +-
 drivers/i2c/busses/i2c-pca-isa.c           |    2 +-
 drivers/i2c/busses/i2c-pxa.c               |    2 +-
 drivers/i2c/busses/i2c-s3c2410.c           |    2 +-
 drivers/i2c/chips/isp1301_omap.c           |    2 +-
 drivers/i2c/chips/tps65010.c               |    2 +-
 drivers/ide/legacy/hd.c                    |    2 +-
 drivers/ieee1394/ohci1394.c                |    2 +-
 drivers/ieee1394/pcilynx.c                 |    2 +-
 drivers/infiniband/hw/amso1100/c2.c        |    4 ++--
 drivers/infiniband/hw/ehca/ehca_irq.c      |    4 ++--
 drivers/infiniband/hw/ehca/ehca_irq.h      |    4 ++--
 drivers/infiniband/hw/ipath/ipath_intr.c   |    2 +-
 drivers/infiniband/hw/ipath/ipath_kernel.h |    2 +-
 drivers/infiniband/hw/mthca/mthca_eq.c     |    8 ++++----
 drivers/input/joystick/amijoy.c            |    2 +-
 drivers/input/keyboard/amikbd.c            |    2 +-
 drivers/input/keyboard/corgikbd.c          |    2 +-
 drivers/input/keyboard/hilkbd.c            |    2 +-
 drivers/input/keyboard/locomokbd.c         |    2 +-
 drivers/input/keyboard/omap-keypad.c       |    2 +-
 drivers/input/keyboard/spitzkbd.c          |    4 ++--
 drivers/input/misc/ixp4xx-beeper.c         |    2 +-
 drivers/input/mouse/amimouse.c             |    2 +-
 drivers/input/mouse/inport.c               |    2 +-
 drivers/input/mouse/logibm.c               |    2 +-
 drivers/input/mouse/pc110pad.c             |    8 ++++----
 drivers/input/mouse/rpcmouse.c             |    2 +-
 drivers/input/serio/ambakmi.c              |    2 +-
 drivers/input/serio/ct82c710.c             |    2 +-
 drivers/input/serio/gscps2.c               |    4 ++--
 drivers/input/serio/hp_sdc.c               |    6 +++---
 drivers/input/serio/maceps2.c              |    2 +-
 drivers/input/serio/pcips2.c               |    2 +-
 drivers/input/serio/q40kbd.c               |    2 +-
 drivers/input/serio/rpckbd.c               |    4 ++--
 drivers/input/serio/sa1111ps2.c            |    4 ++--
 drivers/input/touchscreen/ads7846.c        |    2 +-
 drivers/input/touchscreen/corgi_ts.c       |    2 +-
 drivers/input/touchscreen/h3600_ts_input.c |    4 ++--
 drivers/input/touchscreen/hp680_ts_input.c |    2 +-
 drivers/input/touchscreen/mk712.c          |    2 +-
 drivers/isdn/hardware/avm/avmcard.h        |    4 ++--
 drivers/isdn/hardware/avm/b1.c             |    2 +-
 drivers/isdn/hardware/avm/b1dma.c          |    2 +-
 drivers/isdn/hardware/avm/c4.c             |    2 +-
 drivers/isdn/hardware/avm/t1isa.c          |    2 +-
 drivers/isdn/hardware/eicon/divasmain.c    |    2 +-
 drivers/isdn/hisax/asuscom.c               |    4 ++--
 drivers/isdn/hisax/avm_a1.c                |    2 +-
 drivers/isdn/hisax/avm_a1p.c               |    2 +-
 drivers/isdn/hisax/avm_pci.c               |    2 +-
 drivers/isdn/hisax/bkm_a4t.c               |    2 +-
 drivers/isdn/hisax/bkm_a8.c                |    2 +-
 drivers/isdn/hisax/diva.c                  |    8 ++++----
 drivers/isdn/hisax/elsa.c                  |    8 ++++----
 drivers/isdn/hisax/elsa_ser.c              |    2 +-
 drivers/isdn/hisax/enternow_pci.c          |    2 +-
 drivers/isdn/hisax/gazel.c                 |    4 ++--
 drivers/isdn/hisax/hfc4s8s_l1.c            |    2 +-
 drivers/isdn/hisax/hfc_pci.c               |    2 +-
 drivers/isdn/hisax/hfc_sx.c                |    2 +-
 drivers/isdn/hisax/hfcscard.c              |    2 +-
 drivers/isdn/hisax/hisax_fcpcipnp.c        |    4 ++--
 drivers/isdn/hisax/isurf.c                 |    2 +-
 drivers/isdn/hisax/ix1_micro.c             |    2 +-
 drivers/isdn/hisax/mic.c                   |    2 +-
 drivers/isdn/hisax/netjet.h                |    2 +-
 drivers/isdn/hisax/niccy.c                 |    2 +-
 drivers/isdn/hisax/nj_s.c                  |    2 +-
 drivers/isdn/hisax/nj_u.c                  |    2 +-
 drivers/isdn/hisax/s0box.c                 |    2 +-
 drivers/isdn/hisax/saphir.c                |    2 +-
 drivers/isdn/hisax/sedlbauer.c             |    6 +++---
 drivers/isdn/hisax/sportster.c             |    2 +-
 drivers/isdn/hisax/teleint.c               |    2 +-
 drivers/isdn/hisax/teles0.c                |    2 +-
 drivers/isdn/hisax/teles3.c                |    2 +-
 drivers/isdn/hisax/telespci.c              |    2 +-
 drivers/isdn/hysdn/boardergo.c             |    2 +-
 drivers/isdn/pcbit/layer2.c                |    2 +-
 drivers/isdn/pcbit/layer2.h                |    2 +-
 drivers/isdn/sc/card.h                     |    2 +-
 drivers/macintosh/macio-adb.c              |    4 ++--
 drivers/macintosh/smu.c                    |    4 ++--
 drivers/macintosh/via-cuda.c               |    4 ++--
 drivers/macintosh/via-pmu.c                |    8 ++++----
 drivers/media/common/saa7146_core.c        |    2 +-
 drivers/media/dvb/b2c2/flexcop-pci.c       |    2 +-
 drivers/media/dvb/bt8xx/bt878.c            |    2 +-
 drivers/media/dvb/pluto2/pluto2.c          |    2 +-
 drivers/media/video/arv.c                  |    2 +-
 drivers/media/video/bt8xx/bttv-driver.c    |    2 +-
 drivers/media/video/cafe_ccic.c            |    2 +-
 drivers/media/video/cx23885/cx23885-core.c |    2 +-
 drivers/media/video/cx88/cx88-alsa.c       |    2 +-
 drivers/media/video/cx88/cx88-mpeg.c       |    2 +-
 drivers/media/video/cx88/cx88-video.c      |    2 +-
 drivers/media/video/ivtv/ivtv-irq.c        |    2 +-
 drivers/media/video/ivtv/ivtv-irq.h        |    2 +-
 drivers/media/video/meye.c                 |    2 +-
 drivers/media/video/saa7134/saa7134-alsa.c |    2 +-
 drivers/media/video/saa7134/saa7134-core.c |    2 +-
 drivers/media/video/saa7134/saa7134-oss.c  |    2 +-
 drivers/media/video/stradis.c              |    2 +-
 drivers/media/video/vino.c                 |    2 +-
 drivers/media/video/zoran_device.c         |    3 +--
 drivers/media/video/zoran_device.h         |    2 +-
 drivers/message/fusion/mptbase.c           |    4 ++--
 drivers/message/i2o/pci.c                  |    3 +--
 drivers/mfd/ucb1x00-core.c                 |    2 +-
 drivers/misc/ibmasm/ibmasm.h               |    2 +-
 drivers/misc/ibmasm/lowlevel.c             |    2 +-
 drivers/misc/phantom.c                     |    2 +-
 drivers/misc/sony-laptop.c                 |    2 +-
 drivers/misc/tifm_7xx1.c                   |    2 +-
 drivers/mmc/host/at91_mci.c                |    2 +-
 drivers/mmc/host/au1xmmc.c                 |    4 ++--
 drivers/mmc/host/imxmmc.c                  |    2 +-
 drivers/mmc/host/mmci.c                    |    4 ++--
 drivers/mmc/host/omap.c                    |    4 ++--
 drivers/mmc/host/pxamci.c                  |    4 ++--
 drivers/mmc/host/sdhci.c                   |    2 +-
 drivers/mmc/host/wbsd.c                    |    2 +-
 drivers/mtd/nand/cafe_nand.c               |    2 +-
 drivers/parisc/dino.c                      |    2 +-
 drivers/parisc/eisa.c                      |    2 +-
 drivers/parisc/gsc.c                       |    2 +-
 drivers/parisc/gsc.h                       |    2 +-
 drivers/parisc/superio.c                   |    2 +-
 drivers/pci/hotplug/cpci_hotplug_core.c    |    2 +-
 drivers/pci/hotplug/cpqphp.h               |    2 +-
 drivers/pci/hotplug/cpqphp_ctrl.c          |    2 +-
 drivers/pci/hotplug/pciehp_hpc.c           |    6 +++---
 drivers/pci/hotplug/shpchp_hpc.c           |    6 +++---
 drivers/pci/pcie/aer/aerdrv.c              |    3 +--
 drivers/pcmcia/at91_cf.c                   |    2 +-
 drivers/pcmcia/hd64465_ss.c                |    4 ++--
 drivers/pcmcia/i82092.c                    |    2 +-
 drivers/pcmcia/i82092aa.h                  |    2 +-
 drivers/pcmcia/m32r_cfc.c                  |    2 +-
 drivers/pcmcia/m32r_pcc.c                  |    4 ++--
 drivers/pcmcia/m8xx_pcmcia.c               |    4 ++--
 drivers/pcmcia/omap_cf.c                   |    2 +-
 drivers/pcmcia/pcmcia_resource.c           |    2 +-
 drivers/pcmcia/pd6729.c                    |    6 +++---
 drivers/pcmcia/soc_common.c                |    2 +-
 drivers/pcmcia/vrc4171_card.c              |    2 +-
 drivers/pcmcia/vrc4173_cardu.c             |    2 +-
 drivers/pcmcia/yenta_socket.c              |    6 +++---
 drivers/pnp/resource.c                     |    2 +-
 drivers/power/pda_power.c                  |    2 +-
 drivers/rtc/rtc-cmos.c                     |    2 +-
 drivers/rtc/rtc-ds1553.c                   |    2 +-
 drivers/rtc/rtc-m48t59.c                   |    2 +-
 drivers/rtc/rtc-pl031.c                    |    2 +-
 drivers/rtc/rtc-s3c.c                      |    4 ++--
 drivers/rtc/rtc-sa1100.c                   |    4 ++--
 drivers/rtc/rtc-sh.c                       |    6 +++---
 drivers/rtc/rtc-stk17ta8.c                 |    2 +-
 drivers/rtc/rtc-vr41xx.c                   |    4 ++--
 drivers/sbus/char/bbc_i2c.c                |    2 +-
 drivers/sbus/char/cpwatchdog.c             |    4 ++--
 drivers/sbus/char/uctrl.c                  |    2 +-
 drivers/serial/21285.c                     |    4 ++--
 drivers/serial/68328serial.c               |    2 +-
 drivers/serial/amba-pl010.c                |    2 +-
 drivers/serial/amba-pl011.c                |    2 +-
 drivers/serial/atmel_serial.c              |    2 +-
 drivers/serial/clps711x.c                  |    4 ++--
 drivers/serial/cpm_uart/cpm_uart_core.c    |    2 +-
 drivers/serial/crisv10.c                   |    6 +++---
 drivers/serial/dz.c                        |    2 +-
 drivers/serial/icom.c                      |    2 +-
 drivers/serial/imx.c                       |    6 +++---
 drivers/serial/ioc4_serial.c               |    3 +--
 drivers/serial/ip22zilog.c                 |    2 +-
 drivers/serial/jsm/jsm_neo.c               |    2 +-
 drivers/serial/m32r_sio.c                  |    2 +-
 drivers/serial/mcfserial.c                 |    2 +-
 drivers/serial/mpc52xx_uart.c              |    4 ++--
 drivers/serial/mpsc.c                      |    2 +-
 drivers/serial/netx-serial.c               |    2 +-
 drivers/serial/pmac_zilog.c                |    2 +-
 drivers/serial/pxa.c                       |    2 +-
 drivers/serial/s3c2410.c                   |    4 ++--
 drivers/serial/sa1100.c                    |    2 +-
 drivers/serial/serial_lh7a40x.c            |    2 +-
 drivers/serial/serial_txx9.c               |    2 +-
 drivers/serial/sh-sci.c                    |   10 +++++-----
 drivers/serial/sn_console.c                |    2 +-
 drivers/serial/sunhv.c                     |    2 +-
 drivers/serial/sunsab.c                    |    2 +-
 drivers/serial/sunsu.c                     |    4 ++--
 drivers/serial/sunzilog.c                  |    2 +-
 drivers/serial/v850e_uart.c                |    4 ++--
 drivers/serial/vr41xx_siu.c                |    2 +-
 drivers/sn/ioc3.c                          |    4 ++--
 drivers/spi/pxa2xx_spi.c                   |    2 +-
 drivers/spi/spi_mpc83xx.c                  |    2 +-
 drivers/spi/spi_s3c24xx.c                  |    2 +-
 drivers/uio/uio.c                          |    4 ++--
 drivers/uio/uio_cif.c                      |    3 ++-
 drivers/usb/core/hcd.c                     |    2 +-
 drivers/usb/core/hcd.h                     |    2 +-
 drivers/usb/gadget/amd5536udc.c            |    2 +-
 drivers/usb/gadget/at91_udc.c              |    2 +-
 drivers/usb/gadget/goku_udc.c              |    2 +-
 drivers/usb/gadget/lh7a40x_udc.c           |    2 +-
 drivers/usb/gadget/net2280.c               |    2 +-
 drivers/usb/gadget/omap_udc.c              |    6 +++---
 drivers/usb/gadget/pxa2xx_udc.c            |    6 +++---
 drivers/video/amifb.c                      |    4 ++--
 drivers/video/arcfb.c                      |    2 +-
 drivers/video/atafb.c                      |    2 +-
 drivers/video/aty/atyfb_base.c             |    2 +-
 drivers/video/au1200fb.c                   |    2 +-
 drivers/video/console/fbcon.c              |    4 ++--
 drivers/video/intelfb/intelfbhw.c          |    2 +-
 drivers/video/matrox/matroxfb_base.c       |    2 +-
 drivers/video/pvr2fb.c                     |    4 ++--
 drivers/video/pxafb.c                      |    2 +-
 drivers/video/s3c2410fb.c                  |    2 +-
 drivers/video/sa1100fb.c                   |    2 +-
 drivers/watchdog/eurotechwdt.c             |    2 +-
 drivers/watchdog/mpcore_wdt.c              |    2 +-
 drivers/watchdog/s3c2410_wdt.c             |    2 +-
 drivers/watchdog/wdt.c                     |    3 +--
 drivers/watchdog/wdt285.c                  |    2 +-
 drivers/watchdog/wdt_pci.c                 |    2 +-
 drivers/xen/xenbus/xenbus_comms.c          |    2 +-
 include/linux/arcdevice.h                  |    2 +-
 include/linux/ide.h                        |    2 +-
 include/linux/libata.h                     |    2 +-
 include/linux/rtc.h                        |    2 +-
 include/sound/cs4231.h                     |    2 +-
 include/sound/emu10k1.h                    |    2 +-
 include/sound/gus.h                        |    2 +-
 include/sound/initval.h                    |    2 +-
 include/sound/mpu401.h                     |    4 ++--
 include/sound/sb.h                         |    2 +-
 include/sound/vx_core.h                    |    2 +-
 313 files changed, 447 insertions(+), 460 deletions(-)

52afddf59be0049d4118b21bdb1ef6bd1c5a9165
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 352cf81..d154b1e 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -287,7 +287,7 @@ acpi_os_table_override(struct acpi_table_header * existing_table,
 	return AE_OK;
 }
 
-static irqreturn_t acpi_irq(int irq, void *dev_id)
+static irqreturn_t acpi_irq(void *dev_id)
 {
 	return (*acpi_irq_handler) (acpi_irq_context) ? IRQ_HANDLED : IRQ_NONE;
 }
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 10bc3f6..aec151e 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1545,7 +1545,7 @@ static void ahci_irq_clear(struct ata_port *ap)
 	/* TODO */
 }
 
-static irqreturn_t ahci_interrupt(int irq, void *dev_instance)
+static irqreturn_t ahci_interrupt(void *dev_instance)
 {
 	struct ata_host *host = dev_instance;
 	struct ahci_host_priv *hpriv;
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index bbaa545..5d51222 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -6009,7 +6009,7 @@ idle_irq:
  *	IRQ_NONE or IRQ_HANDLED.
  */
 
-irqreturn_t ata_interrupt (int irq, void *dev_instance)
+irqreturn_t ata_interrupt (void *dev_instance)
 {
 	struct ata_host *host = dev_instance;
 	unsigned int i;
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index 199f7e1..2431d06 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -565,7 +565,7 @@ static inline unsigned int adma_intr_mmio(struct ata_host *host)
 	return handled;
 }
 
-static irqreturn_t adma_intr(int irq, void *dev_instance)
+static irqreturn_t adma_intr(void *dev_instance)
 {
 	struct ata_host *host = dev_instance;
 	unsigned int handled = 0;
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index 08595f3..f78f0b0 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -320,7 +320,7 @@ static void inic_host_intr(struct ata_port *ap)
 		ata_port_abort(ap);
 }
 
-static irqreturn_t inic_interrupt(int irq, void *dev_instance)
+static irqreturn_t inic_interrupt(void *dev_instance)
 {
 	struct ata_host *host = dev_instance;
 	void __iomem *mmio_base = host->iomap[MMIO_BAR];
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 7f1b13e..dfd3c3d 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -1699,7 +1699,7 @@ static void mv_pci_error(struct ata_host *host, void __iomem *mmio)
  *      This routine holds the host lock while processing pending
  *      interrupts.
  */
-static irqreturn_t mv_interrupt(int irq, void *dev_instance)
+static irqreturn_t mv_interrupt(void *dev_instance)
 {
 	struct ata_host *host = dev_instance;
 	unsigned int hc, handled = 0, n_hcs;
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 240a892..10bb0ea 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -298,9 +298,9 @@ static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
 static int nv_pci_device_resume(struct pci_dev *pdev);
 #endif
 static void nv_ck804_host_stop(struct ata_host *host);
-static irqreturn_t nv_generic_interrupt(int irq, void *dev_instance);
-static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance);
-static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance);
+static irqreturn_t nv_generic_interrupt(void *dev_instance);
+static irqreturn_t nv_nf2_interrupt(void *dev_instance);
+static irqreturn_t nv_ck804_interrupt(void *dev_instance);
 static int nv_scr_read (struct ata_port *ap, unsigned int sc_reg, u32 *val);
 static int nv_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 
@@ -313,7 +313,7 @@ static int nv_adma_slave_config(struct scsi_device *sdev);
 static int nv_adma_check_atapi_dma(struct ata_queued_cmd *qc);
 static void nv_adma_qc_prep(struct ata_queued_cmd *qc);
 static unsigned int nv_adma_qc_issue(struct ata_queued_cmd *qc);
-static irqreturn_t nv_adma_interrupt(int irq, void *dev_instance);
+static irqreturn_t nv_adma_interrupt(void *dev_instance);
 static void nv_adma_irq_clear(struct ata_port *ap);
 static int nv_adma_port_start(struct ata_port *ap);
 static void nv_adma_port_stop(struct ata_port *ap);
@@ -337,7 +337,7 @@ static void nv_swncq_qc_prep(struct ata_queued_cmd *qc);
 static void nv_swncq_fill_sg(struct ata_queued_cmd *qc);
 static unsigned int nv_swncq_qc_issue(struct ata_queued_cmd *qc);
 static void nv_swncq_irq_clear(struct ata_port *ap, u16 fis);
-static irqreturn_t nv_swncq_interrupt(int irq, void *dev_instance);
+static irqreturn_t nv_swncq_interrupt(void *dev_instance);
 #ifdef CONFIG_PM
 static int nv_swncq_port_suspend(struct ata_port *ap, pm_message_t mesg);
 static int nv_swncq_port_resume(struct ata_port *ap);
@@ -921,7 +921,7 @@ static int nv_host_intr(struct ata_port *ap, u8 irq_stat)
 	return ata_host_intr(ap, qc);
 }
 
-static irqreturn_t nv_adma_interrupt(int irq, void *dev_instance)
+static irqreturn_t nv_adma_interrupt(void *dev_instance)
 {
 	struct ata_host *host = dev_instance;
 	int i, handled = 0;
@@ -1451,7 +1451,7 @@ static unsigned int nv_adma_qc_issue(struct ata_queued_cmd *qc)
 	return 0;
 }
 
-static irqreturn_t nv_generic_interrupt(int irq, void *dev_instance)
+static irqreturn_t nv_generic_interrupt(void *dev_instance)
 {
 	struct ata_host *host = dev_instance;
 	unsigned int i;
@@ -1500,7 +1500,7 @@ static irqreturn_t nv_do_interrupt(struct ata_host *host, u8 irq_stat)
 	return IRQ_RETVAL(handled);
 }
 
-static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance)
+static irqreturn_t nv_nf2_interrupt(void *dev_instance)
 {
 	struct ata_host *host = dev_instance;
 	u8 irq_stat;
@@ -1514,7 +1514,7 @@ static irqreturn_t nv_nf2_interrupt(int irq, void *dev_instance)
 	return ret;
 }
 
-static irqreturn_t nv_ck804_interrupt(int irq, void *dev_instance)
+static irqreturn_t nv_ck804_interrupt(void *dev_instance)
 {
 	struct ata_host *host = dev_instance;
 	u8 irq_stat;
@@ -2318,7 +2318,7 @@ irq_error:
 	return;
 }
 
-static irqreturn_t nv_swncq_interrupt(int irq, void *dev_instance)
+static irqreturn_t nv_swncq_interrupt(void *dev_instance)
 {
 	struct ata_host *host = dev_instance;
 	unsigned int i;
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index 9032131..20927b3 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -707,7 +707,7 @@ static inline unsigned int pdc_port_no_to_ata_no(unsigned int port_no, int is_sa
 	return is_sataii_tx4 ? sataii_tx4_port_remap[port_no] : port_no;
 }
 
-static irqreturn_t pdc_interrupt (int irq, void *dev_instance)
+static irqreturn_t pdc_interrupt (void *dev_instance)
 {
 	struct ata_host *host = dev_instance;
 	struct ata_port *ap;
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index c4c4cd2..5563c33 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -456,7 +456,7 @@ static inline unsigned int qs_intr_mmio(struct ata_host *host)
 	return handled;
 }
 
-static irqreturn_t qs_intr(int irq, void *dev_instance)
+static irqreturn_t qs_intr(void *dev_instance)
 {
 	struct ata_host *host = dev_instance;
 	unsigned int handled = 0;
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index ea3a0ab..85db01c 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -466,7 +466,7 @@ static void sil_host_intr(struct ata_port *ap, u32 bmdma2)
 	ata_port_freeze(ap);
 }
 
-static irqreturn_t sil_interrupt(int irq, void *dev_instance)
+static irqreturn_t sil_interrupt(void *dev_instance)
 {
 	struct ata_host *host = dev_instance;
 	void __iomem *mmio_base = host->iomap[SIL_MMIO_BAR];
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 26ebffc..50a90fc 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -1147,7 +1147,7 @@ static inline void sil24_host_intr(struct ata_port *ap)
 			slot_stat, ap->link.active_tag, ap->link.sactive);
 }
 
-static irqreturn_t sil24_interrupt(int irq, void *dev_instance)
+static irqreturn_t sil24_interrupt(void *dev_instance)
 {
 	struct ata_host *host = dev_instance;
 	void __iomem *host_base = host->iomap[SIL24_HOST_BAR];
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index 9f9f7b3..87f4153 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -803,7 +803,7 @@ static void pdc20621_irq_clear(struct ata_port *ap)
 	readl(mmio + PDC_20621_SEQMASK);
 }
 
-static irqreturn_t pdc20621_interrupt (int irq, void *dev_instance)
+static irqreturn_t pdc20621_interrupt (void *dev_instance)
 {
 	struct ata_host *host = dev_instance;
 	struct ata_port *ap;
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index 0d9be16..4242ff3 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -258,7 +258,7 @@ static void vsc_port_intr(u8 port_status, struct ata_port *ap)
  *
  * Read the interrupt register and process for the devices that have them pending.
  */
-static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance)
+static irqreturn_t vsc_sata_interrupt (void *dev_instance)
 {
 	struct ata_host *host = dev_instance;
 	unsigned int i;
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 41b2204..4eded7e 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -1487,7 +1487,7 @@ static void bug_int(struct atm_dev *dev,unsigned long reason)
 }
 
 
-static irqreturn_t eni_int(int irq,void *dev_id)
+static irqreturn_t eni_int(void *dev_id)
 {
 	struct atm_dev *dev;
 	struct eni_dev *eni_dev;
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 94ebc9d..821b183 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1557,7 +1557,7 @@ static void __devexit free_freepool (struct fs_dev *dev, struct freepool *fp)
 
 
 
-static irqreturn_t fs_irq (int irq, void *dev_id) 
+static irqreturn_t fs_irq (void *dev_id) 
 {
 	int i;
 	u32 status;
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 8b12925..036387b 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -1306,7 +1306,7 @@ fore200e_irq(struct fore200e* fore200e)
 
 
 static irqreturn_t
-fore200e_interrupt(int irq, void* dev)
+fore200e_interrupt(void *dev)
 {
     struct fore200e* fore200e = FORE200E_DEV((struct atm_dev*)dev);
 
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index d33aba6..18aa58e 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -109,7 +109,7 @@ static int he_open(struct atm_vcc *vcc);
 static void he_close(struct atm_vcc *vcc);
 static int he_send(struct atm_vcc *vcc, struct sk_buff *skb);
 static int he_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg);
-static irqreturn_t he_irq_handler(int irq, void *dev_id);
+static irqreturn_t he_irq_handler(void *dev_id);
 static void he_tasklet(unsigned long data);
 static int he_proc_read(struct atm_dev *dev,loff_t *pos,char *page);
 static int he_start(struct atm_dev *dev);
@@ -2216,7 +2216,7 @@ he_tasklet(unsigned long data)
 }
 
 static irqreturn_t
-he_irq_handler(int irq, void *dev_id)
+he_irq_handler(void *dev_id)
 {
 	unsigned long flags;
 	struct he_dev *he_dev = (struct he_dev * )dev_id;
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index eee54c0..411bb1e 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -2780,7 +2780,7 @@ idt77252_collect_stat(struct idt77252_dev *card)
 }
 
 static irqreturn_t
-idt77252_interrupt(int irq, void *dev_id)
+idt77252_interrupt(void *dev_id)
 {
 	struct idt77252_dev *card = dev_id;
 	u32 stat;
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index ef52452..1848ecf 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -2195,7 +2195,7 @@ err_out:
 	return -ENOMEM;
 }   
    
-static irqreturn_t ia_int(int irq, void *dev_id)  
+static irqreturn_t ia_int(void *dev_id)  
 {  
    struct atm_dev *dev;  
    IADEV *iadev;  
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index 144a49f..a4fb1f7 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -1888,7 +1888,7 @@ static inline void lanai_int_1(struct lanai_dev *lanai, u32 reason)
 		reg_write(lanai, ack, IntAck_Reg);
 }
 
-static irqreturn_t lanai_int(int irq, void *devid)
+static irqreturn_t lanai_int(void *devid)
 {
 	struct lanai_dev *lanai = devid;
 	u32 reason;
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index 14ced85..1a0f2bd 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -214,7 +214,7 @@ static void __devinit ns_init_card_error(ns_dev *card, int error);
 static scq_info *get_scq(int size, u32 scd);
 static void free_scq(scq_info *scq, struct atm_vcc *vcc);
 static void push_rxbufs(ns_dev *, struct sk_buff *);
-static irqreturn_t ns_irq_handler(int irq, void *dev_id);
+static irqreturn_t ns_irq_handler(void *dev_id);
 static int ns_open(struct atm_vcc *vcc);
 static void ns_close(struct atm_vcc *vcc);
 static void fill_tst(ns_dev *card, int n, vc_map *vc);
@@ -1194,7 +1194,7 @@ static void push_rxbufs(ns_dev *card, struct sk_buff *skb)
 
 
 
-static irqreturn_t ns_irq_handler(int irq, void *dev_id)
+static irqreturn_t ns_irq_handler(void *dev_id)
 {
    u32 stat_r;
    ns_dev *card;
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index 58583c6..fe37cc3 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -1013,7 +1013,7 @@ static int start_tx(struct atm_dev *dev)
 /*------------------------------- interrupts --------------------------------*/
 
 
-static irqreturn_t zatm_int(int irq,void *dev_id)
+static irqreturn_t zatm_int(void *dev_id)
 {
 	struct atm_dev *dev;
 	struct zatm_dev *zatm_dev;
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 84d6aa5..8ebeae2 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -5254,8 +5254,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
   Controllers.
 */
 
-static irqreturn_t DAC960_GEM_InterruptHandler(int IRQ_Channel,
-				       void *DeviceIdentifier)
+static irqreturn_t DAC960_GEM_InterruptHandler(void *DeviceIdentifier)
 {
   DAC960_Controller_T *Controller = DeviceIdentifier;
   void __iomem *ControllerBaseAddress = Controller->BaseAddress;
@@ -5295,8 +5294,7 @@ static irqreturn_t DAC960_GEM_InterruptHandler(int IRQ_Channel,
   Controllers.
 */
 
-static irqreturn_t DAC960_BA_InterruptHandler(int IRQ_Channel,
-				       void *DeviceIdentifier)
+static irqreturn_t DAC960_BA_InterruptHandler(void *DeviceIdentifier)
 {
   DAC960_Controller_T *Controller = DeviceIdentifier;
   void __iomem *ControllerBaseAddress = Controller->BaseAddress;
@@ -5337,8 +5335,7 @@ static irqreturn_t DAC960_BA_InterruptHandler(int IRQ_Channel,
   Controllers.
 */
 
-static irqreturn_t DAC960_LP_InterruptHandler(int IRQ_Channel,
-				       void *DeviceIdentifier)
+static irqreturn_t DAC960_LP_InterruptHandler(void *DeviceIdentifier)
 {
   DAC960_Controller_T *Controller = DeviceIdentifier;
   void __iomem *ControllerBaseAddress = Controller->BaseAddress;
@@ -5379,8 +5376,7 @@ static irqreturn_t DAC960_LP_InterruptHandler(int IRQ_Channel,
   Controllers.
 */
 
-static irqreturn_t DAC960_LA_InterruptHandler(int IRQ_Channel,
-				       void *DeviceIdentifier)
+static irqreturn_t DAC960_LA_InterruptHandler(void *DeviceIdentifier)
 {
   DAC960_Controller_T *Controller = DeviceIdentifier;
   void __iomem *ControllerBaseAddress = Controller->BaseAddress;
@@ -5417,8 +5413,7 @@ static irqreturn_t DAC960_LA_InterruptHandler(int IRQ_Channel,
   Controllers.
 */
 
-static irqreturn_t DAC960_PG_InterruptHandler(int IRQ_Channel,
-				       void *DeviceIdentifier)
+static irqreturn_t DAC960_PG_InterruptHandler(void *DeviceIdentifier)
 {
   DAC960_Controller_T *Controller = DeviceIdentifier;
   void __iomem *ControllerBaseAddress = Controller->BaseAddress;
@@ -5455,8 +5450,7 @@ static irqreturn_t DAC960_PG_InterruptHandler(int IRQ_Channel,
   Controllers.
 */
 
-static irqreturn_t DAC960_PD_InterruptHandler(int IRQ_Channel,
-				       void *DeviceIdentifier)
+static irqreturn_t DAC960_PD_InterruptHandler(void *DeviceIdentifier)
 {
   DAC960_Controller_T *Controller = DeviceIdentifier;
   void __iomem *ControllerBaseAddress = Controller->BaseAddress;
@@ -5493,8 +5487,7 @@ static irqreturn_t DAC960_PD_InterruptHandler(int IRQ_Channel,
   an arbitrary buffer.
 */
 
-static irqreturn_t DAC960_P_InterruptHandler(int IRQ_Channel,
-				      void *DeviceIdentifier)
+static irqreturn_t DAC960_P_InterruptHandler(void *DeviceIdentifier)
 {
   DAC960_Controller_T *Controller = DeviceIdentifier;
   void __iomem *ControllerBaseAddress = Controller->BaseAddress;
diff --git a/drivers/block/DAC960.h b/drivers/block/DAC960.h
index 85fa9bb..323b3bf 100644
--- a/drivers/block/DAC960.h
+++ b/drivers/block/DAC960.h
@@ -4398,12 +4398,12 @@ static void DAC960_FinalizeController(DAC960_Controller_T *);
 static void DAC960_V1_QueueReadWriteCommand(DAC960_Command_T *);
 static void DAC960_V2_QueueReadWriteCommand(DAC960_Command_T *); 
 static void DAC960_RequestFunction(struct request_queue *);
-static irqreturn_t DAC960_BA_InterruptHandler(int, void *);
-static irqreturn_t DAC960_LP_InterruptHandler(int, void *);
-static irqreturn_t DAC960_LA_InterruptHandler(int, void *);
-static irqreturn_t DAC960_PG_InterruptHandler(int, void *);
-static irqreturn_t DAC960_PD_InterruptHandler(int, void *);
-static irqreturn_t DAC960_P_InterruptHandler(int, void *);
+static irqreturn_t DAC960_BA_InterruptHandler(void *);
+static irqreturn_t DAC960_LP_InterruptHandler(void *);
+static irqreturn_t DAC960_LA_InterruptHandler(void *);
+static irqreturn_t DAC960_PG_InterruptHandler(void *);
+static irqreturn_t DAC960_PD_InterruptHandler(void *);
+static irqreturn_t DAC960_P_InterruptHandler(void *);
 static void DAC960_V1_QueueMonitoringCommand(DAC960_Command_T *);
 static void DAC960_V2_QueueMonitoringCommand(DAC960_Command_T *);
 static void DAC960_MonitoringTimerFunction(unsigned long);
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index c9751b2..75ed236 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -209,7 +209,7 @@ static int fd_device[4] = { 0, 0, 0, 0 };
 
 /* Milliseconds timer */
 
-static irqreturn_t ms_isr(int irq, void *dummy)
+static irqreturn_t ms_isr(void *dummy)
 {
 	ms_busy = -1;
 	wake_up(&ms_wait);
@@ -560,7 +560,7 @@ static unsigned long fd_get_drive_id(int drive)
 	return (id);
 }
 
-static irqreturn_t fd_block_done(int irq, void *dummy)
+static irqreturn_t fd_block_done(void *dummy)
 {
 	if (block_flag)
 		custom.dsklen = 0x4000;
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 94268c7..ccae320 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -342,7 +342,7 @@ static void fd_select_drive( int drive );
 static void fd_deselect( void );
 static void fd_motor_off_timer( unsigned long dummy );
 static void check_change( unsigned long dummy );
-static irqreturn_t floppy_irq (int irq, void *dummy);
+static irqreturn_t floppy_irq (void *dummy);
 static void fd_error( void );
 static int do_format(int drive, int type, struct atari_format_descr *desc);
 static void do_fd_action( int drive );
@@ -573,7 +573,7 @@ static inline void copy_buffer(void *from, void *to)
 
 static void (*FloppyIRQHandler)( int status ) = NULL;
 
-static irqreturn_t floppy_irq (int irq, void *dummy)
+static irqreturn_t floppy_irq (void *dummy)
 {
 	unsigned char status;
 	void (*handler)( int );
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 7c2cfde..212d9a3 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -140,7 +140,7 @@ static struct board_type products[] = {
 static ctlr_info_t *hba[MAX_CTLR];
 
 static void do_cciss_request(struct request_queue *q);
-static irqreturn_t do_cciss_intr(int irq, void *dev_id);
+static irqreturn_t do_cciss_intr(void *dev_id);
 static int cciss_open(struct inode *inode, struct file *filep);
 static int cciss_release(struct inode *inode, struct file *filep);
 static int cciss_ioctl(struct inode *inode, struct file *filep,
@@ -2301,7 +2301,7 @@ static int sendcmd(__u8 cmd, int ctlr, void *buff, size_t size, unsigned int use
 #ifdef CONFIG_CISS_SCSI_TAPE
 	/* if we saved some commands for later, process them now. */
 	if (info_p->scsi_rejects.ncompletions > 0)
-		do_cciss_intr(0, info_p);
+		do_cciss_intr(info_p);
 #endif
 	cmd_free(info_p, c, 1);
 	return status;
@@ -2733,7 +2733,7 @@ static inline long interrupt_not_for_us(ctlr_info_t *h)
 #endif
 }
 
-static irqreturn_t do_cciss_intr(int irq, void *dev_id)
+static irqreturn_t do_cciss_intr(void *dev_id)
 {
 	ctlr_info_t *h = dev_id;
 	CommandList_struct *c;
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 568603d..1dd7d83 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -169,7 +169,7 @@ static inline cmdlist_t *removeQ(cmdlist_t **Qptr, cmdlist_t *c);
 static inline void complete_buffers(struct bio *bio, int ok);
 static inline void complete_command(cmdlist_t *cmd, int timeout);
 
-static irqreturn_t do_ida_intr(int irq, void *dev_id);
+static irqreturn_t do_ida_intr(void *dev_id);
 static void ida_timer(unsigned long tdata);
 static int ida_revalidate(struct gendisk *disk);
 static int revalidate_allvol(ctlr_info_t *host);
@@ -1047,7 +1047,7 @@ static inline void complete_command(cmdlist_t *cmd, int timeout)
  *  Find the command on the completion queue, remove it, tell the OS and
  *  try to queue up more IO
  */
-static irqreturn_t do_ida_intr(int irq, void *dev_id)
+static irqreturn_t do_ida_intr(void *dev_id)
 {
 	ctlr_info_t *h = dev_id;
 	cmdlist_t *c;
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 639ed14..dfb0858 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -220,7 +220,7 @@ static DEFINE_SPINLOCK(floppy_lock);
 static struct completion device_release;
 
 static unsigned short virtual_dma_port = 0x3f0;
-irqreturn_t floppy_interrupt(int irq, void *dev_id);
+irqreturn_t floppy_interrupt(void *dev_id);
 static int set_dor(int fdc, char mask, char data);
 
 #define K_64	0x10000		/* 64KB */
@@ -1734,7 +1734,7 @@ static void print_result(char *message, int inr)
 }
 
 /* interrupt handler. Note that this can be called externally on the Sparc */
-irqreturn_t floppy_interrupt(int irq, void *dev_id)
+irqreturn_t floppy_interrupt(void *dev_id)
 {
 	int do_print;
 	unsigned long f;
diff --git a/drivers/block/lguest_blk.c b/drivers/block/lguest_blk.c
index fa8e423..2d5b4b4 100644
--- a/drivers/block/lguest_blk.c
+++ b/drivers/block/lguest_blk.c
@@ -94,7 +94,7 @@ static void end_entire_request(struct request *req, int uptodate)
 
 /*D:490 This is the interrupt handler, called when a block read or write has
  * been completed for us. */
-static irqreturn_t lgb_irq(int irq, void *_bd)
+static irqreturn_t lgb_irq(void *_bd)
 {
 	/* We handed our "struct blockdev" as the argument to request_irq(), so
 	 * it is passed through to us here.  This tells us which device we're
diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c
index 3c796e2..ec99308 100644
--- a/drivers/block/ps2esdi.c
+++ b/drivers/block/ps2esdi.c
@@ -75,7 +75,7 @@ static int ps2esdi_out_cmd_blk(u_short * cmd_blk);
 
 static void ps2esdi_prep_dma(char *buffer, u_short length, u_char dma_xmode);
 
-static irqreturn_t ps2esdi_interrupt_handler(int irq, void *dev_id);
+static irqreturn_t ps2esdi_interrupt_handler(void *dev_id);
 static void (*current_int_handler) (u_int) = NULL;
 static void ps2esdi_normal_interrupt_handler(u_int);
 static void ps2esdi_initial_reset_int_handler(u_int);
@@ -686,7 +686,7 @@ static void ps2esdi_prep_dma(char *buffer, u_short length, u_char dma_xmode)
 
 
 
-static irqreturn_t ps2esdi_interrupt_handler(int irq, void *dev_id)
+static irqreturn_t ps2esdi_interrupt_handler(void *dev_id)
 {
 	u_int int_ret_code;
 
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index b4e462f..d8c6f2a 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -238,8 +238,8 @@ static void scan_timeout(unsigned long data);
 static void seek_timeout(unsigned long data);
 static void settle_timeout(unsigned long data);
 static void xfer_timeout(unsigned long data);
-static irqreturn_t swim3_interrupt(int irq, void *dev_id);
-/*static void fd_dma_interrupt(int irq, void *dev_id);*/
+static irqreturn_t swim3_interrupt(void *dev_id);
+/*static void fd_dma_interrupt(void *dev_id);*/
 static int grab_drive(struct floppy_state *fs, enum swim_state state,
 		      int interruptible);
 static void release_drive(struct floppy_state *fs);
@@ -624,7 +624,7 @@ static void xfer_timeout(unsigned long data)
 	start_request(fs);
 }
 
-static irqreturn_t swim3_interrupt(int irq, void *dev_id)
+static irqreturn_t swim3_interrupt(void *dev_id)
 {
 	struct floppy_state *fs = (struct floppy_state *) dev_id;
 	struct swim3 __iomem *sw = fs->swim3;
@@ -777,7 +777,7 @@ static irqreturn_t swim3_interrupt(int irq, void *dev_id)
 }
 
 /*
-static void fd_dma_interrupt(int irq, void *dev_id)
+static void fd_dma_interrupt(void *dev_id)
 {
 }
 */
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index 402209f..309597f 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -1200,7 +1200,7 @@ static inline void carm_handle_responses(struct carm_host *host)
 	host->resp_idx += work;
 }
 
-static irqreturn_t carm_interrupt(int irq, void *__host)
+static irqreturn_t carm_interrupt(void *__host)
 {
 	struct carm_host *host = __host;
 	void __iomem *mmio;
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 99806f9..e9fdb4f 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -570,7 +570,7 @@ static int mm_make_request(struct request_queue *q, struct bio *bio)
 --                              mm_interrupt
 -----------------------------------------------------------------------------------
 */
-static irqreturn_t mm_interrupt(int irq, void *__card)
+static irqreturn_t mm_interrupt(void *__card)
 {
 	struct cardinfo *card = (struct cardinfo *) __card;
 	unsigned int dma_status;
diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index 624d30f..aa19ae6 100644
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -462,7 +462,7 @@ static void xd_recalibrate (u_char drive)
 }
 
 /* xd_interrupt_handler: interrupt service routine */
-static irqreturn_t xd_interrupt_handler(int irq, void *dev_id)
+static irqreturn_t xd_interrupt_handler(void *dev_id)
 {
 	if (inb(XD_STATUS) & STAT_INTERRUPT) {							/* check if it was our device */
 #ifdef DEBUG_OTHER
diff --git a/drivers/block/xd.h b/drivers/block/xd.h
index cffd44a..4f43623 100644
--- a/drivers/block/xd.h
+++ b/drivers/block/xd.h
@@ -109,7 +109,7 @@ static int xd_ioctl (struct inode *inode,struct file *file,unsigned int cmd,unsi
 static int xd_readwrite (u_char operation,XD_INFO *disk,char *buffer,u_int block,u_int count);
 static void xd_recalibrate (u_char drive);
 
-static irqreturn_t xd_interrupt_handler(int irq, void *dev_id);
+static irqreturn_t xd_interrupt_handler(void *dev_id);
 static u_char xd_setup_dma (u_char opcode,u_char *buffer,u_int count);
 static u_char *xd_build (u_char *cmdblk,u_char command,u_char drive,u_char head,u_short cylinder,u_char sector,u_char count,u_char control);
 static void xd_watchdog (unsigned long unused);
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 2bdebcb..7743400 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -445,7 +445,7 @@ static void blkif_completion(struct blk_shadow *s)
 		gnttab_end_foreign_access(s->req.seg[i].gref, 0, 0UL);
 }
 
-static irqreturn_t blkif_interrupt(int irq, void *dev_id)
+static irqreturn_t blkif_interrupt(void *dev_id)
 {
 	struct request *req;
 	struct blkif_response *bret;
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 3d468f5..d57f2e2 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -447,7 +447,7 @@ static void check_modem_status(struct async_struct *info)
 	}
 }
 
-static irqreturn_t ser_vbl_int( int irq, void *data)
+static irqreturn_t ser_vbl_int(void *data)
 {
         /* vbl is just a periodic interrupt we tie into to update modem status */
 	struct async_struct * info = IRQ_ports;
@@ -460,7 +460,7 @@ static irqreturn_t ser_vbl_int( int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-static irqreturn_t ser_rx_int(int irq, void *dev_id)
+static irqreturn_t ser_rx_int(void *dev_id)
 {
 	struct async_struct * info;
 
@@ -480,7 +480,7 @@ static irqreturn_t ser_rx_int(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static irqreturn_t ser_tx_int(int irq, void *dev_id)
+static irqreturn_t ser_tx_int(void *dev_id)
 {
 	struct async_struct * info;
 
diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c
index 1f0b752..6f03607 100644
--- a/drivers/char/applicom.c
+++ b/drivers/char/applicom.c
@@ -110,7 +110,7 @@ static ssize_t ac_read (struct file *, char __user *, size_t, loff_t *);
 static ssize_t ac_write (struct file *, const char __user *, size_t, loff_t *);
 static int ac_ioctl(struct inode *, struct file *, unsigned int,
 		    unsigned long);
-static irqreturn_t ac_interrupt(int, void *);
+static irqreturn_t ac_interrupt(void *);
 
 static const struct file_operations ac_fops = {
 	.owner = THIS_MODULE,
@@ -617,7 +617,7 @@ static ssize_t ac_read (struct file *filp, char __user *buf, size_t count, loff_
 	} 
 }
 
-static irqreturn_t ac_interrupt(int vec, void *dev_instance)
+static irqreturn_t ac_interrupt(void *dev_instance)
 {
 	unsigned int i;
 	unsigned int FlagInt;
diff --git a/drivers/char/drm/drm_os_linux.h b/drivers/char/drm/drm_os_linux.h
index 114e54e..cda69c8 100644
--- a/drivers/char/drm/drm_os_linux.h
+++ b/drivers/char/drm/drm_os_linux.h
@@ -30,7 +30,7 @@
 #define DRM_MEMORYBARRIER()		mb()
 
 /** IRQ handler arguments and return type and values */
-#define DRM_IRQ_ARGS		int irq, void *arg
+#define DRM_IRQ_ARGS		void *arg
 
 /** AGP types */
 #if __OS_HAS_AGP
diff --git a/drivers/char/esp.c b/drivers/char/esp.c
index 2e7ae42..9ac4eb5 100644
--- a/drivers/char/esp.c
+++ b/drivers/char/esp.c
@@ -615,7 +615,7 @@ static inline void check_modem_status(struct esp_struct *info)
 /*
  * This is the serial driver's interrupt routine
  */
-static irqreturn_t rs_interrupt_single(int irq, void *dev_id)
+static irqreturn_t rs_interrupt_single(void *dev_id)
 {
 	struct esp_struct * info;
 	unsigned err_status;
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 4c16778..a51b853 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -140,7 +140,7 @@ static inline void writeq(unsigned long long v, void __iomem *addr)
 }
 #endif
 
-static irqreturn_t hpet_interrupt(int irq, void *data)
+static irqreturn_t hpet_interrupt(void *data)
 {
 	struct hpet_dev *devp;
 	unsigned long isr;
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 8252f86..4c2e0f5 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -295,7 +295,7 @@ static int hvc_poll(struct hvc_struct *hp);
  * NOTE: This API isn't used if the console adapter doesn't support interrupts.
  * In this case the console is poll driven.
  */
-static irqreturn_t hvc_handle_interrupt(int irq, void *dev_instance)
+static irqreturn_t hvc_handle_interrupt(void *dev_instance)
 {
 	/* if hvc_poll request a repoll, then kick the hvcd thread */
 	if (hvc_poll(dev_instance))
diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c
index 69d8866..19c99bc 100644
--- a/drivers/char/hvcs.c
+++ b/drivers/char/hvcs.c
@@ -315,7 +315,7 @@ static DEFINE_SPINLOCK(hvcs_structs_lock);
 
 static void hvcs_unthrottle(struct tty_struct *tty);
 static void hvcs_throttle(struct tty_struct *tty);
-static irqreturn_t hvcs_handle_interrupt(int irq, void *dev_instance);
+static irqreturn_t hvcs_handle_interrupt(void *dev_instance);
 
 static int hvcs_write(struct tty_struct *tty,
 		const unsigned char *buf, int count);
@@ -549,7 +549,7 @@ static void hvcs_throttle(struct tty_struct *tty)
  * handler taking any further interrupts because they are disabled which means
  * the hvcs_struct will always be valid in this handler.
  */
-static irqreturn_t hvcs_handle_interrupt(int irq, void *dev_instance)
+static irqreturn_t hvcs_handle_interrupt(void *dev_instance)
 {
 	struct hvcs_struct *hvcsd = dev_instance;
 
diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c
index d5a752d..069264f 100644
--- a/drivers/char/hvsi.c
+++ b/drivers/char/hvsi.c
@@ -554,7 +554,7 @@ static void hvsi_send_overflow(struct hvsi_struct *hp)
  * must get all pending data because we only get an irq on empty->non-empty
  * transition
  */
-static irqreturn_t hvsi_interrupt(int irq, void *arg)
+static irqreturn_t hvsi_interrupt(void *arg)
 {
 	struct hvsi_struct *hp = (struct hvsi_struct *)arg;
 	struct tty_struct *flip;
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 4f560d0..b0c21dc 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -969,7 +969,7 @@ static void smi_timeout(unsigned long data)
 	add_timer(&(smi_info->si_timer));
 }
 
-static irqreturn_t si_irq_handler(int irq, void *data)
+static irqreturn_t si_irq_handler(void *data)
 {
 	struct smi_info *smi_info = data;
 	unsigned long   flags;
@@ -992,14 +992,14 @@ static irqreturn_t si_irq_handler(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-static irqreturn_t si_bt_irq_handler(int irq, void *data)
+static irqreturn_t si_bt_irq_handler(void *data)
 {
 	struct smi_info *smi_info = data;
 	/* We need to clear the IRQ flag for the BT interface. */
 	smi_info->io.outputb(&smi_info->io, IPMI_BT_INTMASK_REG,
 			     IPMI_BT_INTMASK_CLEAR_IRQ_BIT
 			     | IPMI_BT_INTMASK_ENABLE_IRQ_BIT);
-	return si_irq_handler(irq, data);
+	return si_irq_handler(data);
 }
 
 static int smi_start_processing(void       *send_info,
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 85d596a..897f843 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -506,7 +506,7 @@ sched_again:
  *	Main interrupt handler routine
  */
 
-static irqreturn_t isicom_interrupt(int irq, void *dev_id)
+static irqreturn_t isicom_interrupt(void *dev_id)
 {
 	struct isi_board *card = dev_id;
 	struct isi_port *port;
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
index 3c5802a..9347b92 100644
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
@@ -513,12 +513,11 @@ static int mbcs_gscr_mmap(struct file *fp, struct vm_area_struct *vma)
 
 /**
  * mbcs_completion_intr_handler - Primary completion handler.
- * @irq: irq
  * @arg: soft struct for device
  *
  */
 static irqreturn_t
-mbcs_completion_intr_handler(int irq, void *arg)
+mbcs_completion_intr_handler(void *arg)
 {
 	struct mbcs_soft *soft = (struct mbcs_soft *)arg;
 	void *mmr_base;
diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c
index e60a74c..0792019 100644
--- a/drivers/char/mmtimer.c
+++ b/drivers/char/mmtimer.c
@@ -421,7 +421,6 @@ static int inline reschedule_periodic_timer(mmtimer_t *x)
 
 /**
  * mmtimer_interrupt - timer interrupt handler
- * @irq: irq received
  * @dev_id: device the irq came from
  *
  * Called when one of the comarators matches the counter, This
@@ -433,7 +432,7 @@ static int inline reschedule_periodic_timer(mmtimer_t *x)
  * registers.
  */
 static irqreturn_t
-mmtimer_interrupt(int irq, void *dev_id)
+mmtimer_interrupt(void *dev_id)
 {
 	int i;
 	unsigned long expires = 0;
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 661aca0..7ba3eec 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -401,7 +401,7 @@ static void mxser_stop(struct tty_struct *);
 static void mxser_start(struct tty_struct *);
 static void mxser_hangup(struct tty_struct *);
 static void mxser_rs_break(struct tty_struct *, int);
-static irqreturn_t mxser_interrupt(int, void *);
+static irqreturn_t mxser_interrupt(void *);
 static void mxser_receive_chars(struct mxser_struct *, int *);
 static void mxser_transmit_chars(struct mxser_struct *);
 static void mxser_check_modem_status(struct mxser_struct *, int);
@@ -1890,7 +1890,7 @@ static void mxser_rs_break(struct tty_struct *tty, int break_state)
 /*
  * This is the serial driver's generic interrupt routine
  */
-static irqreturn_t mxser_interrupt(int irq, void *dev_id)
+static irqreturn_t mxser_interrupt(void *dev_id)
 {
 	int status, iir, i;
 	struct mxser_struct *info;
diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c
index 854dbf5..0e0ce9a 100644
--- a/drivers/char/mxser_new.c
+++ b/drivers/char/mxser_new.c
@@ -2264,7 +2264,7 @@ static void mxser_transmit_chars(struct mxser_port *port)
 /*
  * This is the serial driver's generic interrupt routine
  */
-static irqreturn_t mxser_interrupt(int irq, void *dev_id)
+static irqreturn_t mxser_interrupt(void *dev_id)
 {
 	int status, iir, i;
 	struct mxser_board *brd = NULL;
diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c
index 2604246..20049da 100644
--- a/drivers/char/nwbutton.c
+++ b/drivers/char/nwbutton.c
@@ -147,7 +147,7 @@ static void button_sequence_finished (unsigned long parameters)
  *  increments the counter.
  */ 
 
-static irqreturn_t button_handler (int irq, void *dev_id)
+static irqreturn_t button_handler (void *dev_id)
 {
 	button_press_count++;
 	mod_timer(&button_timer, jiffies + bdelay);
diff --git a/drivers/char/nwbutton.h b/drivers/char/nwbutton.h
index c3ebc16..39e2468 100644
--- a/drivers/char/nwbutton.h
+++ b/drivers/char/nwbutton.h
@@ -25,7 +25,7 @@ struct button_callback {
 /* Function prototypes: */
 
 static void button_sequence_finished (unsigned long parameters);
-static irqreturn_t button_handler (int irq, void *dev_id);
+static irqreturn_t button_handler (void *dev_id);
 int button_init (void);
 int button_add_callback (void (*callback) (void), int count);
 int button_del_callback (void (*callback) (void));
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index ec6b65e..ff7bc27 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -111,13 +111,13 @@ static int rtc_has_irq = 1;
 #define hpet_rtc_timer_init() 			do { } while (0)
 #define hpet_rtc_dropped_irq() 			0
 #ifdef RTC_IRQ
-static irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
+static irqreturn_t hpet_rtc_interrupt(void *dev_id)
 {
 	return 0;
 }
 #endif
 #else
-extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id);
+extern irqreturn_t hpet_rtc_interrupt(void *dev_id);
 #endif
 
 /*
@@ -233,7 +233,7 @@ static inline unsigned char rtc_is_updating(void)
  *	(See ./arch/XXXX/kernel/time.c for the set_rtc_mmss() function.)
  */
 
-irqreturn_t rtc_interrupt(int irq, void *dev_id)
+irqreturn_t rtc_interrupt(void *dev_id)
 {
 	/*
 	 *	Can be an alarm interrupt, update complete interrupt,
diff --git a/drivers/char/ser_a2232.c b/drivers/char/ser_a2232.c
index 3c86914..0be33fc 100644
--- a/drivers/char/ser_a2232.c
+++ b/drivers/char/ser_a2232.c
@@ -110,7 +110,7 @@
 
 /***************************** Prototypes ***************************/
 /* The interrupt service routine */
-static irqreturn_t a2232_vbl_inter(int irq, void *data);
+static irqreturn_t a2232_vbl_inter(void *data);
 /* Initialize the port structures */
 static void a2232_init_portstructs(void);
 /* Initialize and register TTY drivers. */
@@ -503,7 +503,7 @@ static int  a2232_open(struct tty_struct * tty, struct file * filp)
 }
 /*** END OF FUNCTIONS EXPECTED BY TTY DRIVER STRUCTS ***/
 
-static irqreturn_t a2232_vbl_inter(int irq, void *data)
+static irqreturn_t a2232_vbl_inter(void *data)
 {
 #if A2232_IOBUFLEN != 256
 #error "Re-Implement a2232_vbl_inter()!"
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index f1497ce..d481b02 100644
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -375,7 +375,7 @@ static inline void cy_sched_event(struct cyclades_port *info, int event)
    whenever the card wants its hand held--chars
    received, out buffer empty, modem change, etc.
  */
-static irqreturn_t cd2401_rxerr_interrupt(int irq, void *dev_id)
+static irqreturn_t cd2401_rxerr_interrupt(void *dev_id)
 {
 	struct tty_struct *tty;
 	struct cyclades_port *info;
@@ -517,7 +517,7 @@ static irqreturn_t cd2401_modem_interrupt(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }				/* cy_modem_interrupt */
 
-static irqreturn_t cd2401_tx_interrupt(int irq, void *dev_id)
+static irqreturn_t cd2401_tx_interrupt(void *dev_id)
 {
 	struct cyclades_port *info;
 	volatile unsigned char *base_addr = (unsigned char *)BASE_ADDR;
@@ -636,7 +636,7 @@ static irqreturn_t cd2401_tx_interrupt(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }				/* cy_tx_interrupt */
 
-static irqreturn_t cd2401_rx_interrupt(int irq, void *dev_id)
+static irqreturn_t cd2401_rx_interrupt(void *dev_id)
 {
 	struct tty_struct *tty;
 	struct cyclades_port *info;
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c
index b9c1dba..e0d94c9 100644
--- a/drivers/char/snsc.c
+++ b/drivers/char/snsc.c
@@ -34,7 +34,7 @@
 #define SCDRV_TIMEOUT	1000
 
 static irqreturn_t
-scdrv_interrupt(int irq, void *subch_data)
+scdrv_interrupt(void *subch_data)
 {
 	struct subch_data_s *sd = subch_data;
 	unsigned long flags;
diff --git a/drivers/char/snsc_event.c b/drivers/char/snsc_event.c
index 1b75b0b..44e0297 100644
--- a/drivers/char/snsc_event.c
+++ b/drivers/char/snsc_event.c
@@ -36,7 +36,7 @@ DECLARE_TASKLET(sn_sysctl_event, scdrv_event, 0);
  * destination.
  */
 static irqreturn_t
-scdrv_event_interrupt(int irq, void *subch_data)
+scdrv_event_interrupt(void *subch_data)
 {
 	struct subch_data_s *sd = subch_data;
 	unsigned long flags;
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 8598585..334e9ec 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -832,7 +832,7 @@ static void sonypi_report_input_event(u8 event)
 }
 
 /* Interrupt handler: some event is available */
-static irqreturn_t sonypi_irq(int irq, void *dev_id)
+static irqreturn_t sonypi_irq(void *dev_id)
 {
 	u8 v1, v2, event = 0;
 	int i, j;
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c
index 35e5803..4a1e647 100644
--- a/drivers/char/tlclk.c
+++ b/drivers/char/tlclk.c
@@ -193,7 +193,7 @@ static DEFINE_SPINLOCK(event_lock);
 
 static int tlclk_major = TLCLK_MAJOR;
 
-static irqreturn_t tlclk_interrupt(int irq, void *dev_id);
+static irqreturn_t tlclk_interrupt(void *dev_id);
 
 static DECLARE_WAIT_QUEUE_HEAD(wq);
 
@@ -864,7 +864,7 @@ static void switchover_timeout(unsigned long data)
 	wake_up(&wq);
 }
 
-static irqreturn_t tlclk_interrupt(int irq, void *dev_id)
+static irqreturn_t tlclk_interrupt(void *dev_id)
 {
 	unsigned long flags;
 
diff --git a/drivers/char/vme_scc.c b/drivers/char/vme_scc.c
index e122a0e..abca6a4 100644
--- a/drivers/char/vme_scc.c
+++ b/drivers/char/vme_scc.c
@@ -80,10 +80,10 @@ static int scc_ioctl(struct tty_struct * tty, struct file * filp,
                      unsigned int cmd, unsigned long arg);
 static void scc_throttle(struct tty_struct *tty);
 static void scc_unthrottle(struct tty_struct *tty);
-static irqreturn_t scc_tx_int(int irq, void *data);
-static irqreturn_t scc_rx_int(int irq, void *data);
-static irqreturn_t scc_stat_int(int irq, void *data);
-static irqreturn_t scc_spcond_int(int irq, void *data);
+static irqreturn_t scc_tx_int(void *data);
+static irqreturn_t scc_rx_int(void *data);
+static irqreturn_t scc_stat_int(void *data);
+static irqreturn_t scc_spcond_int(void *data);
 static void scc_setsignals(struct scc_port *port, int dtr, int rts);
 static void scc_break_ctl(struct tty_struct *tty, int break_state);
 
@@ -420,7 +420,7 @@ module_init(vme_scc_init);
  * Interrupt handlers
  *--------------------------------------------------------------------------*/
 
-static irqreturn_t scc_rx_int(int irq, void *data)
+static irqreturn_t scc_rx_int(void *data)
 {
 	unsigned char	ch;
 	struct scc_port *port = data;
@@ -452,7 +452,7 @@ static irqreturn_t scc_rx_int(int irq, void *data)
 }
 
 
-static irqreturn_t scc_spcond_int(int irq, void *data)
+static irqreturn_t scc_spcond_int(void *data)
 {
 	struct scc_port *port = data;
 	struct tty_struct *tty = port->gs.tty;
@@ -497,7 +497,7 @@ static irqreturn_t scc_spcond_int(int irq, void *data)
 }
 
 
-static irqreturn_t scc_tx_int(int irq, void *data)
+static irqreturn_t scc_tx_int(void *data)
 {
 	struct scc_port *port = data;
 	SCC_ACCESS_INIT(port);
@@ -539,7 +539,7 @@ static irqreturn_t scc_tx_int(int irq, void *data)
 }
 
 
-static irqreturn_t scc_stat_int(int irq, void *data)
+static irqreturn_t scc_stat_int(void *data)
 {
 	struct scc_port *port = data;
 	unsigned channel = port->channel;
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c
index 7e4a785..0f4f5ab 100644
--- a/drivers/dma/ioat_dma.c
+++ b/drivers/dma/ioat_dma.c
@@ -61,7 +61,7 @@ static inline struct ioat_dma_chan *ioat_lookup_chan_by_index(
  * @irq: interrupt id
  * @data: interrupt data
  */
-static irqreturn_t ioat_dma_do_interrupt(int irq, void *data)
+static irqreturn_t ioat_dma_do_interrupt(void *data)
 {
 	struct ioatdma_device *instance = data;
 	struct ioat_dma_chan *ioat_chan;
@@ -94,7 +94,7 @@ static irqreturn_t ioat_dma_do_interrupt(int irq, void *data)
  * @irq: interrupt id
  * @data: interrupt data
  */
-static irqreturn_t ioat_dma_do_interrupt_msix(int irq, void *data)
+static irqreturn_t ioat_dma_do_interrupt_msix(void *data)
 {
 	struct ioat_dma_chan *ioat_chan = data;
 
diff --git a/drivers/fc4/soc.c b/drivers/fc4/soc.c
index d517734..d163ce5 100644
--- a/drivers/fc4/soc.c
+++ b/drivers/fc4/soc.c
@@ -333,7 +333,7 @@ update_out:
 	}
 }
 
-static irqreturn_t soc_intr(int irq, void *dev_id)
+static irqreturn_t soc_intr(void *dev_id)
 {
 	u32 cmd;
 	unsigned long flags;
diff --git a/drivers/fc4/socal.c b/drivers/fc4/socal.c
index c903ebf..9dd04ca 100644
--- a/drivers/fc4/socal.c
+++ b/drivers/fc4/socal.c
@@ -403,7 +403,7 @@ update_out:
 	}
 }
 
-static irqreturn_t socal_intr(int irq, void *dev_id)
+static irqreturn_t socal_intr(void *dev_id)
 {
 	u32 cmd;
 	unsigned long flags;
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 2f307c4..6537c18 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -1012,7 +1012,7 @@ static void bus_reset_tasklet(unsigned long data)
 				 self_id_count, ohci->self_id_buffer);
 }
 
-static irqreturn_t irq_handler(int irq, void *data)
+static irqreturn_t irq_handler(void *data)
 {
 	struct fw_ohci *ohci = data;
 	u32 event, iso_event, cycle_time;
diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c
index 804f0a5..9c88be5 100644
--- a/drivers/i2c/busses/i2c-elektor.c
+++ b/drivers/i2c/busses/i2c-elektor.c
@@ -132,7 +132,7 @@ static void pcf_isa_waitforpin(void) {
 }