From 2a55c3e4e9a99076445a7b3dd6b43c87f4940ced Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Mon, 23 Jul 2007 15:22:09 +0000 Subject: [PATCH] Handle removal of struct pt_regs * in 2.6.19 in same way as the other drivers. --- comedi/drivers/pcmmio.c | 4 ++-- comedi/drivers/usbdux.c | 8 ++++---- comedi/drivers/usbduxfast.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/comedi/drivers/pcmmio.c b/comedi/drivers/pcmmio.c index 3edce8ba..7b58cc3e 100644 --- a/comedi/drivers/pcmmio.c +++ b/comedi/drivers/pcmmio.c @@ -304,7 +304,7 @@ static int pcmmio_dio_insn_bits(comedi_device *dev,comedi_subdevice *s, static int pcmmio_dio_insn_config(comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,lsampl_t *data); -static irqreturn_t interrupt_pcmmio(int irq, void *d, struct pt_regs *regs); +static irqreturn_t interrupt_pcmmio(int irq, void *d PT_REGS_ARG); static void pcmmio_stop_intr(comedi_device *, comedi_subdevice *); static int pcmmio_cancel(comedi_device *dev, comedi_subdevice *s); static int pcmmio_cmd(comedi_device *dev, comedi_subdevice *s); @@ -753,7 +753,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_pcmmio(int irq, void *d, struct pt_regs *regs) +static irqreturn_t interrupt_pcmmio(int irq, void *d PT_REGS_ARG) { int asic, got1 = 0; comedi_device *dev = (comedi_device *)d; diff --git a/comedi/drivers/usbdux.c b/comedi/drivers/usbdux.c index 12302a90..ba2d1a9f 100644 --- a/comedi/drivers/usbdux.c +++ b/comedi/drivers/usbdux.c @@ -387,10 +387,10 @@ static int usbdux_ai_cancel(comedi_device *dev, // analogue IN // interrupt service routine -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) static void usbduxsub_ai_IsocIrq(struct urb *urb) #else -static void usbduxsub_ai_IsocIrq(struct urb *urb, struct pt_regs *regs) +static void usbduxsub_ai_IsocIrq(struct urb *urb PT_REGS_ARG) #endif { int i,err,n; @@ -651,10 +651,10 @@ static int usbdux_ao_cancel(comedi_device *dev, -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) static void usbduxsub_ao_IsocIrq(struct urb *urb) { #else -static void usbduxsub_ao_IsocIrq(struct urb *urb, struct pt_regs *regs) { +static void usbduxsub_ao_IsocIrq(struct urb *urb PT_REGS_ARG) { #endif int i,ret; int8_t* datap; diff --git a/comedi/drivers/usbduxfast.c b/comedi/drivers/usbduxfast.c index 347ead59..fffa3515 100644 --- a/comedi/drivers/usbduxfast.c +++ b/comedi/drivers/usbduxfast.c @@ -322,10 +322,10 @@ static int usbduxfast_ai_cancel(comedi_device *dev, // analogue IN // interrupt service routine -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) static void usbduxfastsub_ai_Irq(struct urb *urb) #else -static void usbduxfastsub_ai_Irq(struct urb *urb, struct pt_regs *regs) +static void usbduxfastsub_ai_Irq(struct urb *urb PT_REGS_ARG) #endif { int n,err; -- 2.26.2