From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Tue, 12 Dec 2006 17:39:55 +0000 (+0000)
Subject: Fixed interrupt handler prototypes for all drivers when compiling
X-Git-Tag: r0_7_74~136
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=86cb01bece7b5385729784ebd814c0b38073d893;p=comedi.git

Fixed interrupt handler prototypes for all drivers when compiling
against 2.6.19 kernels.
---

diff --git a/comedi/drivers/adl_pci9111.c b/comedi/drivers/adl_pci9111.c
index 7fe35a3e..d5ef0090 100644
--- a/comedi/drivers/adl_pci9111.c
+++ b/comedi/drivers/adl_pci9111.c
@@ -944,7 +944,7 @@ static void pci9111_ai_munge(comedi_device *dev, comedi_subdevice *s, void *data
 #undef INTERRUPT_DEBUG
 
 static irqreturn_t
-pci9111_interrupt (int irq, void *p_device, struct pt_regs *regs)
+pci9111_interrupt (int irq, void *p_device PT_REGS_ARG)
 {
 	comedi_device *dev=p_device;
 	comedi_subdevice *subdevice = dev->read_subdev;
diff --git a/comedi/drivers/adl_pci9118.c b/comedi/drivers/adl_pci9118.c
index be3c8727..6cef0cf3 100644
--- a/comedi/drivers/adl_pci9118.c
+++ b/comedi/drivers/adl_pci9118.c
@@ -640,7 +640,7 @@ static void interrupt_pci9118_ai_dma(comedi_device *dev,comedi_subdevice *s,
 /*
 ==============================================================================
 */
-static irqreturn_t interrupt_pci9118(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t interrupt_pci9118(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev = d;
 	unsigned int	int_daq=0,int_amcc,int_adstat;
diff --git a/comedi/drivers/adv_pci1710.c b/comedi/drivers/adv_pci1710.c
index 787b6549..eb4261d4 100644
--- a/comedi/drivers/adv_pci1710.c
+++ b/comedi/drivers/adv_pci1710.c
@@ -715,7 +715,7 @@ static void interrupt_pci1710_half_fifo(void *d)
 /*
 ==============================================================================
 */
-static irqreturn_t interrupt_service_pci1710(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t interrupt_service_pci1710(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev = d;
 
diff --git a/comedi/drivers/amplc_dio200.c b/comedi/drivers/amplc_dio200.c
index d5075bfc..509b1071 100644
--- a/comedi/drivers/amplc_dio200.c
+++ b/comedi/drivers/amplc_dio200.c
@@ -952,7 +952,7 @@ dio200_subdev_intr_cleanup(comedi_device *dev, comedi_subdevice *s)
  * Interrupt service routine.
  */
 static irqreturn_t
-dio200_interrupt(int irq, void *d, struct pt_regs *regs)
+dio200_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev=d;
 	int handled;
diff --git a/comedi/drivers/amplc_pc236.c b/comedi/drivers/amplc_pc236.c
index 8136fab4..41618e67 100644
--- a/comedi/drivers/amplc_pc236.c
+++ b/comedi/drivers/amplc_pc236.c
@@ -153,7 +153,7 @@ static int pc236_intr_cmdtest(comedi_device *dev,comedi_subdevice *s,
 	comedi_cmd *cmd);
 static int pc236_intr_cmd(comedi_device *dev,comedi_subdevice *s);
 static int pc236_intr_cancel(comedi_device *dev,comedi_subdevice *s);
-static irqreturn_t pc236_interrupt(int irq,void *d,struct pt_regs *regs);
+static irqreturn_t pc236_interrupt(int irq,void *d PT_REGS_ARG);
 
 /*
  * Attach is called by the Comedi core to configure the driver
@@ -534,7 +534,7 @@ static int pc236_intr_cancel(comedi_device *dev,comedi_subdevice *s)
  * Interrupt service routine.
  * Based on the comedi_parport driver.
  */
-static irqreturn_t pc236_interrupt(int irq,void *d,struct pt_regs *regs)
+static irqreturn_t pc236_interrupt(int irq,void *d PT_REGS_ARG)
 {
 	comedi_device *dev=d;
 	comedi_subdevice *s=dev->subdevices+1;
diff --git a/comedi/drivers/amplc_pci224.c b/comedi/drivers/amplc_pci224.c
index 7be2eaa1..77ebdea2 100644
--- a/comedi/drivers/amplc_pci224.c
+++ b/comedi/drivers/amplc_pci224.c
@@ -1201,7 +1201,7 @@ pci224_ao_munge(comedi_device *dev, comedi_subdevice *s, void *data,
  * Interrupt handler.
  */
 static irqreturn_t
-pci224_interrupt(int irq, void *d, struct pt_regs *regs)
+pci224_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev = d;
 	comedi_subdevice *s = &dev->subdevices[0];
diff --git a/comedi/drivers/amplc_pci230.c b/comedi/drivers/amplc_pci230.c
index 37d48d34..68c2e815 100644
--- a/comedi/drivers/amplc_pci230.c
+++ b/comedi/drivers/amplc_pci230.c
@@ -281,7 +281,7 @@ static void pci230_cancel_ct0(comedi_device *dev);
 #endif
 static void pci230_cancel_ct1(comedi_device *dev);
 static void pci230_cancel_ct2(comedi_device *dev);
-static irqreturn_t pci230_interrupt(int irq, void *d, struct pt_regs *regs);
+static irqreturn_t pci230_interrupt(int irq, void *d PT_REGS_ARG);
 static int pci230_ao_cmdtest(comedi_device *dev,comedi_subdevice *s, comedi_cmd *cmd);
 static int pci230_ao_cmd(comedi_device *dev, comedi_subdevice *s);
 static int pci230_ao_cancel(comedi_device *dev, comedi_subdevice *s);
@@ -1399,7 +1399,7 @@ static void pci230_cancel_ct2(comedi_device *dev)
 }
 
 /* Interrupt handler */
-static irqreturn_t pci230_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t pci230_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	int status_int;
 	comedi_device *dev = (comedi_device*) d;
diff --git a/comedi/drivers/cb_das16_cs.c b/comedi/drivers/cb_das16_cs.c
index 19bf2b78..52d007b8 100644
--- a/comedi/drivers/cb_das16_cs.c
+++ b/comedi/drivers/cb_das16_cs.c
@@ -103,7 +103,7 @@ static comedi_lrange das16cs_ai_range = { 4, {
 }};
 
 
-static irqreturn_t das16cs_interrupt(int irq, void *d, struct pt_regs *regs);
+static irqreturn_t das16cs_interrupt(int irq, void *d PT_REGS_ARG);
 static int das16cs_ai_rinsn(comedi_device *dev,comedi_subdevice *s,
 	comedi_insn *insn,lsampl_t *data);
 static int das16cs_ai_cmd(comedi_device *dev,comedi_subdevice *s);
@@ -270,7 +270,7 @@ static int das16cs_detach(comedi_device *dev)
 }
 
 
-static irqreturn_t das16cs_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t das16cs_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	//comedi_device *dev = d;
 	return IRQ_HANDLED;
diff --git a/comedi/drivers/cb_pcidas.c b/comedi/drivers/cb_pcidas.c
index 98d7b47f..8615b8d7 100644
--- a/comedi/drivers/cb_pcidas.c
+++ b/comedi/drivers/cb_pcidas.c
@@ -466,7 +466,7 @@ static int cb_pcidas_ao_cmd(comedi_device *dev,comedi_subdevice *s);
 static int cb_pcidas_ao_inttrig(comedi_device *dev, comedi_subdevice *subdev, unsigned int trig_num);
 static int cb_pcidas_ao_cmdtest(comedi_device *dev,comedi_subdevice *s,
 	comedi_cmd *cmd);
-static irqreturn_t cb_pcidas_interrupt(int irq, void *d, struct pt_regs *regs);
+static irqreturn_t cb_pcidas_interrupt(int irq, void *d PT_REGS_ARG);
 static void handle_ao_interrupt(comedi_device *dev, unsigned int status);
 static int cb_pcidas_cancel(comedi_device *dev, comedi_subdevice *s);
 static int cb_pcidas_ao_cancel(comedi_device *dev, comedi_subdevice *s);
@@ -1492,7 +1492,7 @@ static int cb_pcidas_ao_inttrig(comedi_device *dev, comedi_subdevice *s, unsigne
 	return 0;
 }
 
-static irqreturn_t cb_pcidas_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t cb_pcidas_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev = (comedi_device*) d;
 	comedi_subdevice *s = dev->read_subdev;
diff --git a/comedi/drivers/cb_pcidas64.c b/comedi/drivers/cb_pcidas64.c
index 8b506564..5ac162e5 100644
--- a/comedi/drivers/cb_pcidas64.c
+++ b/comedi/drivers/cb_pcidas64.c
@@ -1163,7 +1163,7 @@ static int ai_cmdtest(comedi_device *dev,comedi_subdevice *s, comedi_cmd *cmd);
 static int ao_cmd(comedi_device *dev,comedi_subdevice *s);
 static int ao_inttrig(comedi_device *dev, comedi_subdevice *subdev, unsigned int trig_num);
 static int ao_cmdtest(comedi_device *dev,comedi_subdevice *s, comedi_cmd *cmd);
-static irqreturn_t handle_interrupt(int irq, void *d, struct pt_regs *regs);
+static irqreturn_t handle_interrupt(int irq, void *d PT_REGS_ARG);
 static int ai_cancel(comedi_device *dev, comedi_subdevice *s);
 static int ao_cancel(comedi_device *dev, comedi_subdevice *s);
 static int dio_callback(int dir, int port, int data, unsigned long arg);
@@ -3044,7 +3044,7 @@ static void handle_ao_interrupt(comedi_device *dev, unsigned short status,
 	cfc_handle_events( dev, s );
 }
 
-static irqreturn_t handle_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t handle_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev = d;
 	unsigned short status;
diff --git a/comedi/drivers/comedi_parport.c b/comedi/drivers/comedi_parport.c
index c4f2da9e..6ea3c8c0 100644
--- a/comedi/drivers/comedi_parport.c
+++ b/comedi/drivers/comedi_parport.c
@@ -264,7 +264,7 @@ static int parport_intr_cancel(comedi_device *dev,comedi_subdevice *s)
 	return 0;
 }
 
-static irqreturn_t parport_interrupt(int irq,void *d,struct pt_regs *regs)
+static irqreturn_t parport_interrupt(int irq,void *d PT_REGS_ARG)
 {
 	comedi_device *dev=d;
 	comedi_subdevice *s=dev->subdevices+3;
diff --git a/comedi/drivers/das16.c b/comedi/drivers/das16.c
index 6fc2fe83..cb870651 100644
--- a/comedi/drivers/das16.c
+++ b/comedi/drivers/das16.c
@@ -333,7 +333,7 @@ static void das16_ai_munge(comedi_device *dev, comedi_subdevice *s, void *array,
 	unsigned int num_bytes, unsigned int start_chan_index);
 
 static void das16_reset(comedi_device *dev);
-static irqreturn_t das16_dma_interrupt(int irq, void *d, struct pt_regs *regs);
+static irqreturn_t das16_dma_interrupt(int irq, void *d PT_REGS_ARG);
 static void das16_timer_interrupt(unsigned long arg);
 static void das16_interrupt(comedi_device *dev);
 
@@ -1142,7 +1142,7 @@ static int das16_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *in
 }
 
 
-static irqreturn_t das16_dma_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t das16_dma_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	int status;
 	comedi_device *dev = d;
diff --git a/comedi/drivers/das16m1.c b/comedi/drivers/das16m1.c
index 436621f9..8e957a46 100644
--- a/comedi/drivers/das16m1.c
+++ b/comedi/drivers/das16m1.c
@@ -141,7 +141,7 @@ static int das16m1_cmd_exec(comedi_device *dev,comedi_subdevice *s);
 static int das16m1_cancel(comedi_device *dev, comedi_subdevice *s);
 
 static int das16m1_poll(comedi_device *dev, comedi_subdevice *s);
-static irqreturn_t das16m1_interrupt(int irq, void *d, struct pt_regs *regs);
+static irqreturn_t das16m1_interrupt(int irq, void *d PT_REGS_ARG);
 static void das16m1_handler(comedi_device *dev, unsigned int status);
 
 static unsigned int das16m1_set_pacer(comedi_device *dev, unsigned int ns, int round_flag);
@@ -464,7 +464,7 @@ static int das16m1_poll(comedi_device *dev, comedi_subdevice *s)
 	return s->async->buf_write_count - s->async->buf_read_count;
 }
 
-static irqreturn_t das16m1_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t das16m1_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	int status;
 	comedi_device *dev = d;
diff --git a/comedi/drivers/das1800.c b/comedi/drivers/das1800.c
index e92ebcdb..15162684 100644
--- a/comedi/drivers/das1800.c
+++ b/comedi/drivers/das1800.c
@@ -182,7 +182,7 @@ static int das1800_attach(comedi_device *dev, comedi_devconfig *it);
 static int das1800_detach(comedi_device *dev);
 static int das1800_probe(comedi_device *dev);
 static int das1800_cancel(comedi_device *dev, comedi_subdevice *s);
-static irqreturn_t das1800_interrupt(int irq, void *d, struct pt_regs *regs);
+static irqreturn_t das1800_interrupt(int irq, void *d PT_REGS_ARG);
 static int das1800_ai_poll(comedi_device *dev,comedi_subdevice *s);
 static void das1800_ai_handler(comedi_device *dev);
 static void das1800_handle_dma(comedi_device *dev, comedi_subdevice *s, unsigned int status);
@@ -883,7 +883,7 @@ static int das1800_ai_poll(comedi_device *dev,comedi_subdevice *s)
 	return s->async->buf_write_count - s->async->buf_read_count;
 }
 
-static irqreturn_t das1800_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t das1800_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev = d;
 	unsigned int status;
diff --git a/comedi/drivers/das6402.c b/comedi/drivers/das6402.c
index 9859fd39..9e7730eb 100644
--- a/comedi/drivers/das6402.c
+++ b/comedi/drivers/das6402.c
@@ -97,7 +97,7 @@ This driver has suffered bitrot.
 #define	C0 0x00
 #define	C1 0x40
 #define	C2 0x80
-#define	RWLH 0x30 
+#define	RWLH 0x30
 
 static int das6402_attach(comedi_device *dev,comedi_devconfig *it);
 static int das6402_detach(comedi_device *dev);
@@ -124,7 +124,7 @@ static void das6402_setcounter(comedi_device *dev)
 	BYTE p;
 	unsigned short ctrlwrd;
 
-	/* set up counter0 first, mode 0 */    
+	/* set up counter0 first, mode 0 */
 	p=M0|C0|RWLH;
 	outb_p(p,dev->iobase+15);
 	ctrlwrd=2000;
@@ -152,7 +152,7 @@ static void das6402_setcounter(comedi_device *dev)
 	outb_p(p,dev->iobase+14);
 }
 
-static irqreturn_t intr_handler(int irq,void *d,struct pt_regs *regs)
+static irqreturn_t intr_handler(int irq,void *d PT_REGS_ARG)
 {
 	comedi_device *dev=d;
 	comedi_subdevice *s=dev->subdevices;
@@ -220,7 +220,7 @@ static int das6402_ai_cancel(comedi_device *dev,comedi_subdevice *s)
 	outw_p(SCANL,dev->iobase+2);  /* resets the card fifo */
 	outb_p(0,dev->iobase+9); /* disables interrupts */
 
-	outw_p(SCANL,dev->iobase+2);	
+	outw_p(SCANL,dev->iobase+2);
 
 	return 0;
 }
@@ -242,7 +242,7 @@ static int das6402_ai_mode2(comedi_device *dev,comedi_subdevice *s,comedi_trig *
 	/* um... ignoreirq is a nasty race condition */
 	devpriv->das6402_ignoreirq=0;
 
-	outw_p(SCANL,dev->iobase+2);	
+	outw_p(SCANL,dev->iobase+2);
 
 	return 0;
 }
@@ -256,12 +256,12 @@ static int board_init(comedi_device *dev)
 	devpriv->das6402_ignoreirq=1;
 
 	outb(0x07,dev->iobase+8);
-	
+
 	/* register 11  */
 	outb_p(MODE,dev->iobase+11);
 	b=BIP|SEM|MODE|GAIN|FIFOHFULL;
 	outb_p(b, dev->iobase+11);
-	
+
 	/* register 8   */
 	outb_p(EXTEND,dev->iobase+8);
 	b=EXTEND|MHZ;
@@ -274,7 +274,7 @@ static int board_init(comedi_device *dev)
 	outb_p(b,dev->iobase+9);
 
 	/* register 10   */
-	b=TGSEL|TGEN; 
+	b=TGSEL|TGEN;
 	outb_p(b,dev->iobase+10);
 
 	b=0x07;
diff --git a/comedi/drivers/das800.c b/comedi/drivers/das800.c
index d96768c4..99d9654a 100644
--- a/comedi/drivers/das800.c
+++ b/comedi/drivers/das800.c
@@ -255,7 +255,7 @@ static comedi_driver driver_das800={
 	offset:		sizeof(das800_board),
 };
 
-static irqreturn_t das800_interrupt(int irq, void *d, struct pt_regs *regs);
+static irqreturn_t das800_interrupt(int irq, void *d PT_REGS_ARG);
 static void enable_das800(comedi_device *dev);
 static void disable_das800(comedi_device *dev);
 static int das800_ai_do_cmdtest(comedi_device *dev,comedi_subdevice *s,comedi_cmd *cmd);
@@ -345,7 +345,7 @@ static int das800_probe(comedi_device *dev)
 COMEDI_INITCLEANUP(driver_das800);
 
 /* interrupt service routine */
-static irqreturn_t das800_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t das800_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	short i;		/* loop index */
 	sampl_t dataPoint = 0;
diff --git a/comedi/drivers/dmm32at.c b/comedi/drivers/dmm32at.c
index 63f29e5d..e0034fb6 100644
--- a/comedi/drivers/dmm32at.c
+++ b/comedi/drivers/dmm32at.c
@@ -312,7 +312,7 @@ static int dmm32at_ai_cmdtest(comedi_device *dev,comedi_subdevice *s,
 static int dmm32at_ai_cmd(comedi_device *dev, comedi_subdevice *s);
 static int dmm32at_ai_cancel(comedi_device *dev,comedi_subdevice *s);
 static int dmm32at_ns_to_timer(unsigned int *ns,int round);
-static irqreturn_t dmm32at_isr(int irq,void *d,struct pt_regs *regs);
+static irqreturn_t dmm32at_isr(int irq,void *d PT_REGS_ARG);
 void dmm32at_setaitimer(comedi_device *dev,unsigned int nansec);
 
 
@@ -837,7 +837,7 @@ static int dmm32at_ai_cancel(comedi_device *dev,comedi_subdevice *s){
 	return 0;
 }
 
-static irqreturn_t dmm32at_isr(int irq,void *d,struct pt_regs *regs){
+static irqreturn_t dmm32at_isr(int irq,void *d PT_REGS_ARG){
 	unsigned char intstat;
 	unsigned int samp;
 	unsigned short msb, lsb;
diff --git a/comedi/drivers/dt2811.c b/comedi/drivers/dt2811.c
index 32dbb46a..5f929752 100644
--- a/comedi/drivers/dt2811.c
+++ b/comedi/drivers/dt2811.c
@@ -255,7 +255,7 @@ static comedi_lrange *dac_range_types[] =
 #define DT2811_TIMEOUT 5
 
 #if 0
-static void dt2811_interrupt(int irq, void *d, struct pt_regs *regs)
+static void dt2811_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	int lo, hi;
 	int data;
diff --git a/comedi/drivers/dt2814.c b/comedi/drivers/dt2814.c
index bdcee406..80b8dc19 100644
--- a/comedi/drivers/dt2814.c
+++ b/comedi/drivers/dt2814.c
@@ -70,7 +70,7 @@ static comedi_driver driver_dt2814={
 };
 COMEDI_INITCLEANUP(driver_dt2814);
 
-static irqreturn_t dt2814_interrupt(int irq,void *dev,struct pt_regs * regs);
+static irqreturn_t dt2814_interrupt(int irq,void *dev PT_REGS_ARG);
 
 typedef struct{
 	int ntrig;
@@ -329,7 +329,7 @@ static int dt2814_detach(comedi_device *dev)
 }
 
 
-static irqreturn_t dt2814_interrupt(int irq,void *d,struct pt_regs * regs)
+static irqreturn_t dt2814_interrupt(int irq,void *d PT_REGS_ARG)
 {
 	int lo,hi;
 	comedi_device *dev=d;
diff --git a/comedi/drivers/dt282x.c b/comedi/drivers/dt282x.c
index c688709f..4cf4db26 100644
--- a/comedi/drivers/dt282x.c
+++ b/comedi/drivers/dt282x.c
@@ -578,7 +578,7 @@ static int prep_ao_dma(comedi_device * dev,int dma_index,int n)
 	return n;
 }
 
-static irqreturn_t dt282x_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t dt282x_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev = d;
 	comedi_subdevice *s = dev->subdevices+0;
diff --git a/comedi/drivers/dt3000.c b/comedi/drivers/dt3000.c
index c83cf99c..f65fd95e 100644
--- a/comedi/drivers/dt3000.c
+++ b/comedi/drivers/dt3000.c
@@ -333,7 +333,7 @@ static void dt3k_writesingle(comedi_device *dev,unsigned int subsys,
 
 static int debug_n_ints = 0;
 
-static irqreturn_t dt3k_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t dt3k_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev = d;
 	comedi_subdevice *s = dev->subdevices + 0;
diff --git a/comedi/drivers/gsc_hpdi.c b/comedi/drivers/gsc_hpdi.c
index 52b08152..2970e07d 100644
--- a/comedi/drivers/gsc_hpdi.c
+++ b/comedi/drivers/gsc_hpdi.c
@@ -58,7 +58,7 @@ void abort_dma( comedi_device *dev, unsigned int channel );
 static int hpdi_cmd( comedi_device *dev, comedi_subdevice *s );
 static int hpdi_cmd_test( comedi_device *dev, comedi_subdevice *s, comedi_cmd *cmd );
 static int hpdi_cancel( comedi_device *dev, comedi_subdevice *s );
-static irqreturn_t handle_interrupt(int irq, void *d, struct pt_regs *regs);
+static irqreturn_t handle_interrupt(int irq, void *d PT_REGS_ARG);
 static int dio_config_block_size( comedi_device *dev, lsampl_t *data );
 
 #undef HPDI_DEBUG	// disable debugging messages
@@ -917,7 +917,7 @@ static void drain_dma_buffers(comedi_device *dev, unsigned int channel)
 	// XXX check for buffer overrun somehow
 }
 
-static irqreturn_t handle_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t handle_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev = d;
 	comedi_subdevice *s = dev->read_subdev;
diff --git a/comedi/drivers/icp_multi.c b/comedi/drivers/icp_multi.c
index b1918be8..3541cdf2 100644
--- a/comedi/drivers/icp_multi.c
+++ b/comedi/drivers/icp_multi.c
@@ -600,11 +600,10 @@ static int icp_multi_insn_write_ctr(comedi_device * dev, comedi_subdevice * s, c
 	Parameters:
 		int irq
 		void *d			Pointer to current device
-		struct pt_regs *regs	Pointer to
 
 ==============================================================================
 */
-static irqreturn_t interrupt_service_icp_multi(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t interrupt_service_icp_multi(int irq, void *d PT_REGS_ARG)
 {
         comedi_device *dev = d;
 	int	int_no;
diff --git a/comedi/drivers/me4000.c b/comedi/drivers/me4000.c
index 2dc0d91c..718e29a4 100644
--- a/comedi/drivers/me4000.c
+++ b/comedi/drivers/me4000.c
@@ -189,8 +189,8 @@ static int ai_write_chanlist(
 
 static irqreturn_t me4000_ai_isr(
 	int irq,
-	void *dev_id,
-	struct pt_regs *regs);
+	void *dev_id
+	PT_REGS_ARG);
 
 static int me4000_ai_do_cmd_test(
 	comedi_device *dev,
@@ -1674,7 +1674,7 @@ static int me4000_ai_do_cmd_test(
 
 
 
-static irqreturn_t me4000_ai_isr(int irq, void *dev_id, struct pt_regs *regs){
+static irqreturn_t me4000_ai_isr(int irq, void *dev_id PT_REGS_ARG){
     unsigned int tmp;
     comedi_device *dev = dev_id;
     comedi_subdevice *s = dev->subdevices;
diff --git a/comedi/drivers/ni_6527.c b/comedi/drivers/ni_6527.c
index 16169250..436d0e04 100644
--- a/comedi/drivers/ni_6527.c
+++ b/comedi/drivers/ni_6527.c
@@ -197,7 +197,7 @@ static int ni6527_do_insn_bits(comedi_device *dev,comedi_subdevice *s,
 	return 2;
 }
 
-static irqreturn_t ni6527_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t ni6527_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev = d;
 	comedi_subdevice *s = dev->subdevices + 2;
diff --git a/comedi/drivers/ni_65xx.c b/comedi/drivers/ni_65xx.c
index 90ed50a5..0e5a97b2 100644
--- a/comedi/drivers/ni_65xx.c
+++ b/comedi/drivers/ni_65xx.c
@@ -449,7 +449,7 @@ static int ni_65xx_dio_insn_bits(comedi_device *dev,comedi_subdevice *s,
 	return insn->n;
 }
 
-static irqreturn_t ni_65xx_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t ni_65xx_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev = d;
 	comedi_subdevice *s = dev->subdevices + 2;
diff --git a/comedi/drivers/ni_at_a2150.c b/comedi/drivers/ni_at_a2150.c
index e078f602..aa2459f2 100644
--- a/comedi/drivers/ni_at_a2150.c
+++ b/comedi/drivers/ni_at_a2150.c
@@ -177,7 +177,7 @@ static comedi_driver driver_a2150={
 	detach:		a2150_detach,
 };
 
-static irqreturn_t a2150_interrupt(int irq, void *d, struct pt_regs *regs);
+static irqreturn_t a2150_interrupt(int irq, void *d PT_REGS_ARG);
 static int a2150_ai_cmdtest(comedi_device *dev,comedi_subdevice *s,comedi_cmd *cmd);
 static int a2150_ai_cmd(comedi_device *dev, comedi_subdevice *s);
 static int a2150_ai_rinsn(comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, lsampl_t *data);
@@ -202,7 +202,7 @@ static void ni_dump_regs(comedi_device *dev)
 #endif
 
 /* interrupt service routine */
-static irqreturn_t a2150_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t a2150_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	int i;
 	int status;
diff --git a/comedi/drivers/ni_atmio16d.c b/comedi/drivers/ni_atmio16d.c
index 0de50833..bc3850bd 100644
--- a/comedi/drivers/ni_atmio16d.c
+++ b/comedi/drivers/ni_atmio16d.c
@@ -127,7 +127,7 @@ static atmio16_board_t atmio16_boards[]={
 /* function prototypes */
 static int atmio16d_attach(comedi_device *dev,comedi_devconfig *it);
 static int atmio16d_detach(comedi_device *dev);
-static irqreturn_t atmio16d_interrupt(int irq, void *d, struct pt_regs *regs);
+static irqreturn_t atmio16d_interrupt(int irq, void *d PT_REGS_ARG);
 static int atmio16d_ai_cmdtest(comedi_device *dev, comedi_subdevice *s, comedi_cmd *cmd);
 static int atmio16d_ai_cmd(comedi_device *dev, comedi_subdevice *s);
 static int atmio16d_ai_cancel(comedi_device *dev, comedi_subdevice *s);
@@ -254,7 +254,7 @@ static void reset_atmio16d(comedi_device *dev)
 	outw(2048, dev->iobase+DAC1_REG);
 }
 
-static irqreturn_t atmio16d_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t atmio16d_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev = d;
 	comedi_subdevice *s = dev->subdevices + 0;
diff --git a/comedi/drivers/ni_labpc.c b/comedi/drivers/ni_labpc.c
index 2a5222cd..9e6f7327 100644
--- a/comedi/drivers/ni_labpc.c
+++ b/comedi/drivers/ni_labpc.c
@@ -163,7 +163,7 @@ NI manuals:
 
 static int labpc_attach(comedi_device *dev,comedi_devconfig *it);
 static int labpc_cancel(comedi_device *dev, comedi_subdevice *s);
-static irqreturn_t labpc_interrupt(int irq, void *d, struct pt_regs *regs);
+static irqreturn_t labpc_interrupt(int irq, void *d PT_REGS_ARG);
 static int labpc_drain_fifo(comedi_device *dev);
 static void labpc_drain_dma(comedi_device *dev);
 static void handle_isa_dma(comedi_device *dev);
@@ -1317,7 +1317,7 @@ static int labpc_ai_cmd(comedi_device *dev, comedi_subdevice *s)
 }
 
 /* interrupt service routine */
-static irqreturn_t labpc_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t labpc_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev = d;
 	comedi_subdevice *s = dev->read_subdev;
diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c
index df285d5e..ca049e87 100644
--- a/comedi/drivers/ni_mio_common.c
+++ b/comedi/drivers/ni_mio_common.c
@@ -433,7 +433,7 @@ static inline void ni_set_bits(comedi_device *dev, int reg, int bits, int value)
 }
 
 
-static irqreturn_t ni_E_interrupt(int irq,void *d,struct pt_regs * regs)
+static irqreturn_t ni_E_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev=d;
 	unsigned short a_status;
diff --git a/comedi/drivers/ni_pcidio.c b/comedi/drivers/ni_pcidio.c
index 7d7e74a6..93bbf840 100644
--- a/comedi/drivers/ni_pcidio.c
+++ b/comedi/drivers/ni_pcidio.c
@@ -420,7 +420,7 @@ static int nidio96_8255_cb(int dir,int port,int data,unsigned long iobase)
 	}
 }
 
-static irqreturn_t nidio_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t nidio_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev=d;
 	comedi_subdevice *s = dev->subdevices;
diff --git a/comedi/drivers/pcl711.c b/comedi/drivers/pcl711.c
index 66ada6c6..0bc2971e 100644
--- a/comedi/drivers/pcl711.c
+++ b/comedi/drivers/pcl711.c
@@ -179,7 +179,7 @@ typedef struct {
 
 #define devpriv ((pcl711_private *)dev->private)
 
-static irqreturn_t pcl711_interrupt(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t pcl711_interrupt(int irq, void *d PT_REGS_ARG)
 {
 	int lo, hi;
 	int data;
diff --git a/comedi/drivers/pcl812.c b/comedi/drivers/pcl812.c
index 8c3f4d63..e721abaa 100644
--- a/comedi/drivers/pcl812.c
+++ b/comedi/drivers/pcl812.c
@@ -848,7 +848,7 @@ static int pcl812_ai_cmd(comedi_device *dev,comedi_subdevice *s)
 /*
 ==============================================================================
 */
-static irqreturn_t interrupt_pcl812_ai_int(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t interrupt_pcl812_ai_int(int irq, void *d)
 {
 	char err=1;
 	unsigned int mask, timeout;
@@ -931,7 +931,7 @@ static void transfer_from_dma_buf(comedi_device *dev,comedi_subdevice *s,
 /*
 ==============================================================================
 */
-static irqreturn_t interrupt_pcl812_ai_dma(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t interrupt_pcl812_ai_dma(int irq, void *d)
 {
 	comedi_device *dev = d;
 	comedi_subdevice *s = dev->subdevices + 0;
@@ -976,12 +976,12 @@ static irqreturn_t interrupt_pcl812_ai_dma(int irq, void *d, struct pt_regs *reg
 /*
 ==============================================================================
 */
-static irqreturn_t interrupt_pcl812(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t interrupt_pcl812(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev = d;
 
-	if (devpriv->ai_dma) { return interrupt_pcl812_ai_dma(irq, d, regs); }
-			else { return interrupt_pcl812_ai_int(irq, d, regs); };
+	if (devpriv->ai_dma) { return interrupt_pcl812_ai_dma(irq, d); }
+			else { return interrupt_pcl812_ai_int(irq, d); };
 }
 
 /*
diff --git a/comedi/drivers/pcl816.c b/comedi/drivers/pcl816.c
index d617561d..80e5a04d 100644
--- a/comedi/drivers/pcl816.c
+++ b/comedi/drivers/pcl816.c
@@ -285,7 +285,7 @@ static int pcl816_ai_insn_read(comedi_device *dev, comedi_subdevice *s,
    one sample per interrupt version
 */
 static irqreturn_t
-interrupt_pcl816_ai_mode13_int (int irq, void *d, struct pt_regs *regs)
+interrupt_pcl816_ai_mode13_int (int irq, void *d)
 {
 	comedi_device *dev = d;
 	comedi_subdevice *s = dev->subdevices + 0;
@@ -370,7 +370,7 @@ static void transfer_from_dma_buf(comedi_device *dev,comedi_subdevice *s,
 }
 
 
-static irqreturn_t interrupt_pcl816_ai_mode13_dma(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t interrupt_pcl816_ai_mode13_dma(int irq, void *d)
 {
   comedi_device *dev = d;
   comedi_subdevice *s = dev->subdevices + 0;
@@ -417,7 +417,7 @@ static irqreturn_t interrupt_pcl816_ai_mode13_dma(int irq, void *d, struct pt_re
     INT procedure
 */
 static irqreturn_t
-interrupt_pcl816 (int irq, void *d, struct pt_regs *regs)
+interrupt_pcl816 (int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev = d;
 	DPRINTK("<I>");
@@ -431,10 +431,10 @@ interrupt_pcl816 (int irq, void *d, struct pt_regs *regs)
 	switch (devpriv->int816_mode)  {
     case INT_TYPE_AI1_DMA:
     case INT_TYPE_AI3_DMA:
-		return interrupt_pcl816_ai_mode13_dma (irq, d, regs);
+		return interrupt_pcl816_ai_mode13_dma (irq, d);
     case INT_TYPE_AI1_INT:
     case INT_TYPE_AI3_INT:
-		return interrupt_pcl816_ai_mode13_int (irq, d, regs);
+		return interrupt_pcl816_ai_mode13_int (irq, d);
     }
 
 
diff --git a/comedi/drivers/pcl818.c b/comedi/drivers/pcl818.c
index f675d60d..0ae5596f 100644
--- a/comedi/drivers/pcl818.c
+++ b/comedi/drivers/pcl818.c
@@ -499,7 +499,7 @@ static int pcl818_do_insn_bits(comedi_device *dev, comedi_subdevice *s,
    analog input interrupt mode 1 & 3, 818 cards
    one sample per interrupt version
 */
-static irqreturn_t interrupt_pcl818_ai_mode13_int(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t interrupt_pcl818_ai_mode13_int(int irq, void *d)
 {
 	comedi_device *dev = d;
 	comedi_subdevice *s = dev->subdevices + 0;
@@ -549,7 +549,7 @@ conv_finish:
 ==============================================================================
    analog input dma mode 1 & 3, 818 cards
 */
-static irqreturn_t interrupt_pcl818_ai_mode13_dma(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t interrupt_pcl818_ai_mode13_dma(int irq, void *d)
 {
 	comedi_device *dev = d;
 	comedi_subdevice *s = dev->subdevices + 0;
@@ -613,7 +613,7 @@ static irqreturn_t interrupt_pcl818_ai_mode13_dma(int irq, void *d, struct pt_re
 ==============================================================================
    analog input dma mode 1 & 3 over RTC, 818 cards
 */
-static irqreturn_t interrupt_pcl818_ai_mode13_dma_rtc(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t interrupt_pcl818_ai_mode13_dma_rtc(int irq, void *d)
 {
 	comedi_device *dev = d;
 	comedi_subdevice *s = dev->subdevices + 0;
@@ -701,7 +701,7 @@ static irqreturn_t interrupt_pcl818_ai_mode13_dma_rtc(int irq, void *d, struct p
 ==============================================================================
    analog input interrupt mode 1 & 3, 818HD/HG cards
 */
-static irqreturn_t interrupt_pcl818_ai_mode13_fifo(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t interrupt_pcl818_ai_mode13_fifo(int irq, void *d)
 {
 	comedi_device *dev = d;
 	comedi_subdevice *s = dev->subdevices + 0;
@@ -763,7 +763,7 @@ static irqreturn_t interrupt_pcl818_ai_mode13_fifo(int irq, void *d, struct pt_r
 ==============================================================================
     INT procedure
 */
-static irqreturn_t interrupt_pcl818(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t interrupt_pcl818(int irq, void *d PT_REGS_ARG)
 {
 	comedi_device *dev = d;
 
@@ -778,17 +778,17 @@ static irqreturn_t interrupt_pcl818(int irq, void *d, struct pt_regs *regs)
 	switch (devpriv->ai_mode) {
 	case INT_TYPE_AI1_DMA:
 	case INT_TYPE_AI3_DMA:
-		return interrupt_pcl818_ai_mode13_dma(irq, d, regs);
+		return interrupt_pcl818_ai_mode13_dma(irq, d);
 	case INT_TYPE_AI1_INT:
 	case INT_TYPE_AI3_INT:
-		return interrupt_pcl818_ai_mode13_int(irq, d, regs);
+		return interrupt_pcl818_ai_mode13_int(irq, d);
 	case INT_TYPE_AI1_FIFO:
 	case INT_TYPE_AI3_FIFO:
-		return interrupt_pcl818_ai_mode13_fifo(irq, d, regs);
+		return interrupt_pcl818_ai_mode13_fifo(irq, d);
 #ifdef PCL818_MODE13_AO
 	case INT_TYPE_AO1_INT:
 	case INT_TYPE_AO3_INT:
-		return interrupt_pcl818_ao_mode13_int(irq, d, regs);
+		return interrupt_pcl818_ao_mode13_int(irq, d);
 #endif
 	default:
 		break;
diff --git a/comedi/drivers/pcmuio.c b/comedi/drivers/pcmuio.c
index e592424f..fd3a3078 100644
--- a/comedi/drivers/pcmuio.c
+++ b/comedi/drivers/pcmuio.c
@@ -265,7 +265,7 @@ static int pcmuio_dio_insn_bits(comedi_device *dev,comedi_subdevice *s,
 static int pcmuio_dio_insn_config(comedi_device *dev,comedi_subdevice *s,
                                   comedi_insn *insn,lsampl_t *data);
 
-static irqreturn_t interrupt_pcmuio(int irq, void *d, struct pt_regs *regs);
+static irqreturn_t interrupt_pcmuio(int irq, void *d PT_REGS_ARG);
 static void pcmuio_stop_intr(comedi_device *, comedi_subdevice *);
 static int  pcmuio_cancel(comedi_device *dev, comedi_subdevice *s);
 static int pcmuio_cmd(comedi_device *dev, comedi_subdevice *s);
@@ -683,7 +683,7 @@ static void unlock_port(comedi_device *dev, int asic, int port)
   (void)unlock_port(dev, asic, port); /* not reached, suppress compiler warnings*/
 }
 
-static irqreturn_t interrupt_pcmuio(int irq, void *d, struct pt_regs *regs)
+static irqreturn_t interrupt_pcmuio(int irq, void *d PT_REGS_ARG)
 {
   int asic, got1 = 0;
   comedi_device *dev = (comedi_device *)d;
diff --git a/comedi/drivers/quatech_daqp_cs.c b/comedi/drivers/quatech_daqp_cs.c
index aa7f4581..615a7544 100644
--- a/comedi/drivers/quatech_daqp_cs.c
+++ b/comedi/drivers/quatech_daqp_cs.c
@@ -311,7 +311,7 @@ static int daqp_ai_cancel(comedi_device *dev, comedi_subdevice *s)
  * which run pretty quick.
  */
 
-static void daqp_interrupt(int irq, void * dev_id, struct pt_regs *regs)
+static void daqp_interrupt(int irq, void * dev_id PT_REGS_ARG)
 {
 	local_info_t *local = (local_info_t *)dev_id;
 	comedi_device *dev = local->dev;
diff --git a/comedi/drivers/rtd520.c b/comedi/drivers/rtd520.c
index 3e92a50f..b8fa662a 100644
--- a/comedi/drivers/rtd520.c
+++ b/comedi/drivers/rtd520.c
@@ -734,7 +734,7 @@ static int rtd_ai_cmd ( comedi_device *dev, comedi_subdevice *s);
 static int rtd_ai_cancel ( comedi_device *dev, comedi_subdevice *s);
 //static int rtd_ai_poll (comedi_device *dev,comedi_subdevice *s);
 static int rtd_ns_to_timer (unsigned int *ns, int roundMode);
-static irqreturn_t rtd_interrupt ( int irq, void *d, struct pt_regs *regs);
+static irqreturn_t rtd_interrupt ( int irq, void *d PT_REGS_ARG);
 
 
 /*
@@ -1501,8 +1501,8 @@ static int ai_process_dma (
 */
 static irqreturn_t rtd_interrupt (
     int irq,				/* interrupt number (ignored) */
-    void *d,				/* our data */
-    struct pt_regs *regs)		/* cpu context (ignored) */
+    void *d				/* our data */
+    PT_REGS_ARG)		/* cpu context (ignored) */
 {
 	comedi_device *dev = d;		/* must be called "dev" for devpriv */
 	u16 status;
diff --git a/comedi/drivers/rti800.c b/comedi/drivers/rti800.c
index 8be08b1c..c9b62305 100644
--- a/comedi/drivers/rti800.c
+++ b/comedi/drivers/rti800.c
@@ -139,7 +139,7 @@ static comedi_driver driver_rti800={
 };
 COMEDI_INITCLEANUP(driver_rti800);
 
-static irqreturn_t rti800_interrupt(int irq, void *dev, struct pt_regs *regs);
+static irqreturn_t rti800_interrupt(int irq, void *dev PT_REGS_ARG);
 
 typedef struct {
 	enum {
@@ -165,7 +165,7 @@ typedef struct {
 
 #define RTI800_TIMEOUT 100
 
-static irqreturn_t rti800_interrupt(int irq, void *dev, struct pt_regs *regs)
+static irqreturn_t rti800_interrupt(int irq, void *dev PT_REGS_ARG)
 {
 	return IRQ_HANDLED;
 }
diff --git a/comedi/drivers/s626.c b/comedi/drivers/s626.c
index b631cfd1..1bef910a 100644
--- a/comedi/drivers/s626.c
+++ b/comedi/drivers/s626.c
@@ -243,7 +243,7 @@ static int s626_ns_to_timer(int *nanosec,int round_mode);
 static int s626_ai_load_polllist(uint8_t *ppl, comedi_cmd *cmd);
 static int s626_ai_inttrig(comedi_device *dev,comedi_subdevice *s,
 			   unsigned int trignum);
-static irqreturn_t s626_irq_handler(int irq,void *d,struct pt_regs * regs);
+static irqreturn_t s626_irq_handler(int irq,void *d PT_REGS_ARG);
 static lsampl_t s626_ai_reg_to_uint(int data);
 /* static lsampl_t s626_uint_to_reg(comedi_subdevice *s, int data); */
 
@@ -914,7 +914,7 @@ static lsampl_t s626_ai_reg_to_uint(int data){
 /*   return 0; */
 /* } */
 
-static irqreturn_t s626_irq_handler(int irq,void *d,struct pt_regs * regs)
+static irqreturn_t s626_irq_handler(int irq,void *d PT_REGS_ARG)
 {
   comedi_device *dev=d;
   comedi_subdevice *s;