Staging: comedi: cb_pcimdas: Remove timer_private typedef

[cascardo/linux.git] / drivers / staging / comedi / drivers / cb_pcimdas.c

diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c
index 0e739a5..af705fa 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -83,7 +83,7 @@ See http://www.measurementcomputing.com/PDFManuals/pcim-das1602_16.pdf for more
 #define RESID_COUNT_L 14
 
 /* Board description */
-typedef struct cb_pcimdas_board_struct {
+struct cb_pcimdas_board {
        const char *name;
        unsigned short device_id;
        int ai_se_chans;        // Inputs in single-ended mode
@@ -97,10 +97,10 @@ typedef struct cb_pcimdas_board_struct {
        int fifo_size;          // number of samples fifo can hold
        int dio_bits;           // number of dio bits
        int has_dio;            // has DIO
-       const comedi_lrange *ranges;
-} cb_pcimdas_board;
+       const struct comedi_lrange *ranges;
+};
 
-static const cb_pcimdas_board cb_pcimdas_boards[] = {
+static const struct cb_pcimdas_board cb_pcimdas_boards[] = {
        {
              name:     "PCIM-DAS1602/16",
              device_id:0x56,
@@ -134,12 +134,12 @@ MODULE_DEVICE_TABLE(pci, cb_pcimdas_pci_table);
 /*
  * Useful for shorthand access to the particular board structure
  */
-#define thisboard ((const cb_pcimdas_board *)dev->board_ptr)
+#define thisboard ((const struct cb_pcimdas_board *)dev->board_ptr)
 
 /* 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 cb_pcimdas_private {
        int data;
 
        // would be useful for a PCI device
@@ -161,13 +161,13 @@ typedef struct {
        unsigned short int port_c;      // copy of BADR4+2
        unsigned short int dio_mode;    // copy of BADR4+3
 
-} cb_pcimdas_private;
+};
 
 /*
  * most drivers define the following macro to make it easy to
  * access the private structure.
  */
-#define devpriv ((cb_pcimdas_private *)dev->private)
+#define devpriv ((struct cb_pcimdas_private *)dev->private)
 
 /*
  * The struct comedi_driver structure tells the Comedi core module
@@ -175,7 +175,7 @@ typedef struct {
  * the board, and also about the kernel module that contains
  * the device code.
  */
-static int cb_pcimdas_attach(struct comedi_device * dev, comedi_devconfig * it);
+static int cb_pcimdas_attach(struct comedi_device * dev, struct comedi_devconfig * it);
 static int cb_pcimdas_detach(struct comedi_device * dev);
 static struct comedi_driver driver_cb_pcimdas = {
       driver_name:"cb_pcimdas",
@@ -185,11 +185,11 @@ static struct comedi_driver driver_cb_pcimdas = {
 };
 
 static int cb_pcimdas_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+       struct comedi_insn * insn, unsigned int * data);
 static int cb_pcimdas_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+       struct comedi_insn * insn, unsigned int * data);
 static int cb_pcimdas_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+       struct comedi_insn * insn, unsigned int * data);
 
 /*
  * Attach is called by the Comedi core to configure the driver
@@ -197,7 +197,7 @@ static int cb_pcimdas_ao_rinsn(struct comedi_device * dev, struct comedi_subdevi
  * in the driver structure, dev->board_ptr contains that
  * address.
  */
-static int cb_pcimdas_attach(struct comedi_device * dev, comedi_devconfig * it)
+static int cb_pcimdas_attach(struct comedi_device * dev, struct comedi_devconfig * it)
 {
        struct comedi_subdevice *s;
        struct pci_dev *pcidev;
@@ -209,7 +209,7 @@ static int cb_pcimdas_attach(struct comedi_device * dev, comedi_devconfig * it)
 /*
  * Allocate the private structure area.
  */
-       if (alloc_private(dev, sizeof(cb_pcimdas_private)) < 0)
+       if (alloc_private(dev, sizeof(struct cb_pcimdas_private)) < 0)
                return -ENOMEM;
 
 /*
@@ -373,7 +373,7 @@ static int cb_pcimdas_detach(struct comedi_device * dev)
  * mode.
  */
 static int cb_pcimdas_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, i;
        unsigned int d;
@@ -438,7 +438,7 @@ static int cb_pcimdas_ai_rinsn(struct comedi_device * dev, struct comedi_subdevi
 }
 
 static int cb_pcimdas_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        int i;
        int chan = CR_CHAN(insn->chanspec);
@@ -466,7 +466,7 @@ static int cb_pcimdas_ao_winsn(struct comedi_device * dev, struct comedi_subdevi
 /* AO subdevices should have a read insn as well as a write insn.
  * Usually this means copying a value stored in devpriv. */
 static int cb_pcimdas_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        int i;
        int chan = CR_CHAN(insn->chanspec);