Staging: comedi: Finish removing ni_private typedef

[safe/jmp/linux-2.6] / drivers / staging / comedi / drivers / pcmmio.c

diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c
index 0dcc099..8c332c2 100644 (file)
--- a/drivers/staging/comedi/drivers/pcmmio.c
+++ b/drivers/staging/comedi/drivers/pcmmio.c
@@ -140,13 +140,13 @@ Configuration Options:
 #define PAGE_INT_ID 3
 
 typedef int (*comedi_insn_fn_t) (struct comedi_device *, struct comedi_subdevice *,
-       comedi_insn *, unsigned int *);
+       struct comedi_insn *, unsigned int *);
 
-static int ai_rinsn(struct comedi_device *, struct comedi_subdevice *, comedi_insn *,
+static int ai_rinsn(struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *,
        unsigned int *);
-static int ao_rinsn(struct comedi_device *, struct comedi_subdevice *, comedi_insn *,
+static int ao_rinsn(struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *,
        unsigned int *);
-static int ao_winsn(struct comedi_device *, struct comedi_subdevice *, comedi_insn *,
+static int ao_winsn(struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *,
        unsigned int *);
 
 /*
@@ -154,7 +154,7 @@ static int ao_winsn(struct comedi_device *, struct comedi_subdevice *, comedi_in
  * boards in this way is optional, and completely driver-dependent.
  * Some drivers use arrays such as this, other do not.
  */
-typedef struct pcmmio_board_struct {
+struct pcmmio_board {
        const char *name;
        const int dio_num_asics;
        const int dio_num_ports;
@@ -163,21 +163,21 @@ typedef struct pcmmio_board_struct {
        const int ao_bits;
        const int n_ai_chans;
        const int n_ao_chans;
-       const comedi_lrange *ai_range_table, *ao_range_table;
+       const struct comedi_lrange *ai_range_table, *ao_range_table;
        comedi_insn_fn_t ai_rinsn, ao_rinsn, ao_winsn;
-} pcmmio_board;
+};
 
-static const comedi_lrange ranges_ai =
+static const struct comedi_lrange ranges_ai =
        { 4, {RANGE(-5., 5.), RANGE(-10., 10.), RANGE(0., 5.), RANGE(0.,
                10.)}
 };
 
-static const comedi_lrange ranges_ao =
+static const struct comedi_lrange ranges_ao =
        { 6, {RANGE(0., 5.), RANGE(0., 10.), RANGE(-5., 5.), RANGE(-10., 10.),
        RANGE(-2.5, 2.5), RANGE(-2.5, 7.5)}
 };
 
-static const pcmmio_board pcmmio_boards[] = {
+static const struct pcmmio_board pcmmio_boards[] = {
        {
              name:     "pcmmio",
              dio_num_asics:1,
@@ -197,10 +197,10 @@ static const pcmmio_board pcmmio_boards[] = {
 /*
  * Useful for shorthand access to the particular board structure
  */
-#define thisboard ((const pcmmio_board *)dev->board_ptr)
+#define thisboard ((const struct pcmmio_board *)dev->board_ptr)
 
 /* this structure is for data unique to this subdevice.  */
-typedef struct {
+struct pcmmio_subdev_private {
 
        union {
                /* for DIO: mapping of halfwords (bytes) in port/chanarray to iobase */
@@ -233,12 +233,12 @@ typedef struct {
                        unsigned int shadow_samples[8]; /* the last unsigned int data written */
                } ao;
        };
-} pcmmio_subdev_private;
+};
 
 /* this structure is for data unique to this hardware driver.  If
    several hardware drivers keep similar information in this structure,
    feel free to suggest moving the variable to the struct comedi_device struct.  */
-typedef struct {
+struct pcmmio_private {
        /* stuff for DIO */
        struct {
                unsigned char pagelock; /* current page and lock */
@@ -249,22 +249,22 @@ typedef struct {
                unsigned int irq;
                spinlock_t spinlock;
        } asics[MAX_ASICS];
-       pcmmio_subdev_private *sprivs;
-} pcmmio_private;
+       struct pcmmio_subdev_private *sprivs;
+};
 
 /*
  * most drivers define the following macro to make it easy to
  * access the private structure.
  */
-#define devpriv ((pcmmio_private *)dev->private)
-#define subpriv ((pcmmio_subdev_private *)s->private)
+#define devpriv ((struct pcmmio_private *)dev->private)
+#define subpriv ((struct pcmmio_subdev_private *)s->private)
 /*
  * The struct comedi_driver structure tells the Comedi core module
  * which functions to call to configure/deconfigure (attach/detach)
  * the board, and also about the kernel module that contains
  * the device code.
  */
-static int pcmmio_attach(struct comedi_device * dev, comedi_devconfig * it);
+static int pcmmio_attach(struct comedi_device * dev, struct comedi_devconfig * it);
 static int pcmmio_detach(struct comedi_device * dev);
 
 static struct comedi_driver driver = {
@@ -291,21 +291,21 @@ static struct comedi_driver driver = {
         * devices are such boards.
         */
       board_name:&pcmmio_boards[0].name,
-      offset:sizeof(pcmmio_board),
-      num_names:sizeof(pcmmio_boards) / sizeof(pcmmio_board),
+      offset:sizeof(struct pcmmio_board),
+      num_names:sizeof(pcmmio_boards) / sizeof(struct pcmmio_board),
 };
 
 static int pcmmio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+       struct comedi_insn * insn, unsigned int * data);
 static int pcmmio_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+       struct comedi_insn * insn, unsigned int * data);
 
-static irqreturn_t interrupt_pcmmio(int irq, void *d PT_REGS_ARG);
+static irqreturn_t interrupt_pcmmio(int irq, void *d);
 static void pcmmio_stop_intr(struct comedi_device *, struct comedi_subdevice *);
 static int pcmmio_cancel(struct comedi_device * dev, struct comedi_subdevice * s);
 static int pcmmio_cmd(struct comedi_device * dev, struct comedi_subdevice * s);
 static int pcmmio_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_cmd * cmd);
+       struct comedi_cmd * cmd);
 
 /* some helper functions to deal with specifics of this device's registers */
 static void init_asics(struct comedi_device * dev);    /* sets up/clears ASIC chips to defaults */
@@ -321,7 +321,7 @@ static void unlock_port(struct comedi_device * dev, int asic, int port);
  * in the driver structure, dev->board_ptr contains that
  * address.
  */
-static int pcmmio_attach(struct comedi_device * dev, comedi_devconfig * it)
+static int pcmmio_attach(struct comedi_device * dev, struct comedi_devconfig * it)
 {
        struct comedi_subdevice *s;
        int sdev_no, chans_left, n_dio_subdevs, n_subdevs, port, asic,
@@ -353,7 +353,7 @@ static int pcmmio_attach(struct comedi_device * dev, comedi_devconfig * it)
  * Allocate the private structure area.  alloc_private() is a
  * convenient macro defined in comedidev.h.
  */
-       if (alloc_private(dev, sizeof(pcmmio_private)) < 0) {
+       if (alloc_private(dev, sizeof(struct pcmmio_private)) < 0) {
                printk("cannot allocate private data structure\n");
                return -ENOMEM;
        }
@@ -372,7 +372,7 @@ static int pcmmio_attach(struct comedi_device * dev, comedi_devconfig * it)
        n_dio_subdevs = CALC_N_DIO_SUBDEVS(chans_left);
        n_subdevs = n_dio_subdevs + 2;
        devpriv->sprivs =
-               kcalloc(n_subdevs, sizeof(pcmmio_subdev_private), GFP_KERNEL);
+               kcalloc(n_subdevs, sizeof(struct pcmmio_subdev_private), GFP_KERNEL);
        if (!devpriv->sprivs) {
                printk("cannot allocate subdevice private data structures\n");
                return -ENOMEM;
@@ -551,7 +551,7 @@ static int pcmmio_detach(struct comedi_device * dev)
  * This allows packed reading/writing of the DIO channels.  The
  * comedi core can convert between insn_bits and insn_read/write */
 static int pcmmio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        int byte_no;
        if (insn->n != 2)
@@ -625,7 +625,7 @@ static int pcmmio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdev
  * contains the channel to be changed, and data[0] contains the
  * value COMEDI_INPUT or COMEDI_OUTPUT. */
 static int pcmmio_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        int chan = CR_CHAN(insn->chanspec), byte_no = chan / 8, bit_no =
                chan % 8;
@@ -765,7 +765,7 @@ static void unlock_port(struct comedi_device * dev, int asic, int port)
 }
 #endif /* notused */
 
-static irqreturn_t interrupt_pcmmio(int irq, void *d PT_REGS_ARG)
+static irqreturn_t interrupt_pcmmio(int irq, void *d)
 {
        int asic, got1 = 0;
        struct comedi_device *dev = (struct comedi_device *) d;
@@ -946,7 +946,7 @@ static int pcmmio_start_intr(struct comedi_device * dev, struct comedi_subdevice
        } else {
                unsigned bits = 0, pol_bits = 0, n;
                int nports, firstport, asic, port;
-               comedi_cmd *cmd = &s->async->cmd;
+               struct comedi_cmd *cmd = &s->async->cmd;
 
                if ((asic = subpriv->dio.intr.asic) < 0)
                        return 1;       /* not an interrupt
@@ -1039,7 +1039,7 @@ pcmmio_inttrig_start_intr(struct comedi_device * dev, struct comedi_subdevice *
  */
 static int pcmmio_cmd(struct comedi_device * dev, struct comedi_subdevice * s)
 {
-       comedi_cmd *cmd = &s->async->cmd;
+       struct comedi_cmd *cmd = &s->async->cmd;
        unsigned long flags;
        int event = 0;
 
@@ -1082,7 +1082,7 @@ static int pcmmio_cmd(struct comedi_device * dev, struct comedi_subdevice * s)
  * 'do_cmdtest' function for an 'INTERRUPT' subdevice.
  */
 static int
-pcmmio_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, comedi_cmd * cmd)
+pcmmio_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, struct comedi_cmd * cmd)
 {
        int err = 0;
        unsigned int tmp;
@@ -1195,7 +1195,7 @@ static int adc_wait_ready(unsigned long iobase)
 
 /* All this is for AI and AO */
 static int ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        int n;
        unsigned long iobase = subpriv->iobase;
@@ -1259,7 +1259,7 @@ static int ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,
 }
 
 static int ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        int n;
        for (n = 0; n < insn->n; n++) {
@@ -1289,7 +1289,7 @@ static int wait_dac_ready(unsigned long iobase)
 }
 
 static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        int n;
        unsigned iobase = subpriv->iobase, iooffset = 0;