Staging: comedi: remove comedi-specific wrappers

[linux-block.git] / drivers / staging / comedi / drivers / ni_6527.c

diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c
index e01ecb6760f9020697e647f735a04c72276d1435..491bdf22cd3e86265249a07cc4d3d7fb4b888197 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_6527.c
+++ b/drivers/staging/comedi/drivers/ni_6527.c
@@ -75,13 +75,13 @@ Updated: Sat, 25 Jan 2003 13:24:40 -0800
 #define Rising_Edge_Detection_Enable(x)                (0x018+(x))
 #define Falling_Edge_Detection_Enable(x)       (0x020+(x))
 
-static int ni6527_attach(struct comedi_device * dev, struct comedi_devconfig * it);
-static int ni6527_detach(struct comedi_device * dev);
+static int ni6527_attach(struct comedi_device *dev, struct comedi_devconfig *it);
+static int ni6527_detach(struct comedi_device *dev);
 static struct comedi_driver driver_ni6527 = {
-      driver_name:"ni6527",
-      module:THIS_MODULE,
-      attach:ni6527_attach,
-      detach:ni6527_detach,
+       .driver_name = "ni6527",
+       .module = THIS_MODULE,
+       .attach = ni6527_attach,
+       .detach = ni6527_detach,
 };
 
 struct ni6527_board {
@@ -92,12 +92,12 @@ struct ni6527_board {
 
 static const struct ni6527_board ni6527_boards[] = {
        {
-             dev_id:   0x2b20,
-             name:     "pci-6527",
+       .dev_id = 0x2b20,
+       .name = "pci-6527",
                },
        {
-             dev_id:   0x2b10,
-             name:     "pxi-6527",
+       .dev_id = 0x2b10,
+       .name = "pxi-6527",
                },
 };
 
@@ -120,10 +120,10 @@ struct ni6527_private {
 
 #define devpriv ((struct ni6527_private *)dev->private)
 
-static int ni6527_find_device(struct comedi_device * dev, int bus, int slot);
+static int ni6527_find_device(struct comedi_device *dev, int bus, int slot);
 
-static int ni6527_di_insn_config(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+static int ni6527_di_insn_config(struct comedi_device *dev, struct comedi_subdevice *s,
+       struct comedi_insn *insn, unsigned int *data)
 {
        int chan = CR_CHAN(insn->chanspec);
        unsigned int interval;
@@ -170,8 +170,8 @@ static int ni6527_di_insn_config(struct comedi_device * dev, struct comedi_subde
        return 2;
 }
 
-static int ni6527_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+static int ni6527_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s,
+       struct comedi_insn *insn, unsigned int *data)
 {
        if (insn->n != 2)
                return -EINVAL;
@@ -183,8 +183,8 @@ static int ni6527_di_insn_bits(struct comedi_device * dev, struct comedi_subdevi
        return 2;
 }
 
-static int ni6527_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+static int ni6527_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s,
+       struct comedi_insn *insn, unsigned int *data)
 {
        if (insn->n != 2)
                return -EINVAL;
@@ -212,7 +212,7 @@ static int ni6527_do_insn_bits(struct comedi_device * dev, struct comedi_subdevi
        return 2;
 }
 
-static irqreturn_t ni6527_interrupt(int irq, void *d PT_REGS_ARG)
+static irqreturn_t ni6527_interrupt(int irq, void *d)
 {
        struct comedi_device *dev = d;
        struct comedi_subdevice *s = dev->subdevices + 2;
@@ -233,8 +233,8 @@ static irqreturn_t ni6527_interrupt(int irq, void *d PT_REGS_ARG)
        return IRQ_HANDLED;
 }
 
-static int ni6527_intr_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_cmd * cmd)
+static int ni6527_intr_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
+       struct comedi_cmd *cmd)
 {
        int err = 0;
        int tmp;
@@ -309,9 +309,9 @@ static int ni6527_intr_cmdtest(struct comedi_device * dev, struct comedi_subdevi
        return 0;
 }
 
-static int ni6527_intr_cmd(struct comedi_device * dev, struct comedi_subdevice * s)
+static int ni6527_intr_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 {
-       //struct comedi_cmd *cmd = &s->async->cmd;
+       /* struct comedi_cmd *cmd = &s->async->cmd; */
 
        writeb(ClrEdge | ClrOverflow,
                devpriv->mite->daq_io_addr + Clear_Register);
@@ -322,15 +322,15 @@ static int ni6527_intr_cmd(struct comedi_device * dev, struct comedi_subdevice *
        return 0;
 }
 
-static int ni6527_intr_cancel(struct comedi_device * dev, struct comedi_subdevice * s)
+static int ni6527_intr_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 {
        writeb(0x00, devpriv->mite->daq_io_addr + Master_Interrupt_Control);
 
        return 0;
 }
 
-static int ni6527_intr_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+static int ni6527_intr_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s,
+       struct comedi_insn *insn, unsigned int *data)
 {
        if (insn->n < 1)
                return -EINVAL;
@@ -339,8 +339,8 @@ static int ni6527_intr_insn_bits(struct comedi_device * dev, struct comedi_subde
        return 2;
 }
 
-static int ni6527_intr_insn_config(struct comedi_device * dev, struct comedi_subdevice * s,
-       struct comedi_insn * insn, unsigned int * data)
+static int ni6527_intr_insn_config(struct comedi_device *dev, struct comedi_subdevice *s,
+       struct comedi_insn *insn, unsigned int *data)
 {
        if (insn->n < 1)
                return -EINVAL;
@@ -364,14 +364,15 @@ static int ni6527_intr_insn_config(struct comedi_device * dev, struct comedi_sub
        return 2;
 }
 
-static int ni6527_attach(struct comedi_device * dev, struct comedi_devconfig * it)
+static int ni6527_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
        struct comedi_subdevice *s;
        int ret;
 
        printk("comedi%d: ni6527:", dev->minor);
 
-       if ((ret = alloc_private(dev, sizeof(struct ni6527_private))) < 0)
+       ret = alloc_private(dev, sizeof(struct ni6527_private));
+       if (ret < 0)
                return ret;
 
        ret = ni6527_find_device(dev, it->options[0], it->options[1]);
@@ -389,7 +390,8 @@ static int ni6527_attach(struct comedi_device * dev, struct comedi_devconfig * i
 
        printk(" ID=0x%02x", readb(devpriv->mite->daq_io_addr + ID_Register));
 
-       if ((ret = alloc_subdevices(dev, 3)) < 0)
+       ret = alloc_subdevices(dev, 3);
+       if (ret < 0)
                return ret;
 
        s = dev->subdevices + 0;
@@ -430,8 +432,8 @@ static int ni6527_attach(struct comedi_device * dev, struct comedi_devconfig * i
                devpriv->mite->daq_io_addr + Clear_Register);
        writeb(0x00, devpriv->mite->daq_io_addr + Master_Interrupt_Control);
 
-       ret = comedi_request_irq(mite_irq(devpriv->mite), ni6527_interrupt,
-               IRQF_SHARED, "ni6527", dev);
+       ret = request_irq(mite_irq(devpriv->mite), ni6527_interrupt,
+                         IRQF_SHARED, "ni6527", dev);
        if (ret < 0) {
                printk(" irq not available");
        } else
@@ -442,7 +444,7 @@ static int ni6527_attach(struct comedi_device * dev, struct comedi_devconfig * i
        return 0;
 }
 
-static int ni6527_detach(struct comedi_device * dev)
+static int ni6527_detach(struct comedi_device *dev)
 {
        if (devpriv && devpriv->mite && devpriv->mite->daq_io_addr) {
                writeb(0x00,
@@ -450,7 +452,7 @@ static int ni6527_detach(struct comedi_device * dev)
        }
 
        if (dev->irq) {
-               comedi_free_irq(dev->irq, dev);
+               free_irq(dev->irq, dev);
        }
 
        if (devpriv && devpriv->mite) {
@@ -460,7 +462,7 @@ static int ni6527_detach(struct comedi_device * dev)
        return 0;
 }
 
-static int ni6527_find_device(struct comedi_device * dev, int bus, int slot)
+static int ni6527_find_device(struct comedi_device *dev, int bus, int slot)
 {
        struct mite_struct *mite;
        int i;