Staging: comedi: Remove str_TimerDetails typedef in addi-data/addi_eeprom.c

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

diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index aa43146..fcc5516 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -196,7 +196,7 @@ static inline unsigned int DAC_DATA_REG(unsigned int channel)
 // bit in hexadecimal representation of range index that indicates unipolar input range
 #define IS_UNIPOLAR 0x4
 // analog input ranges for most boards
-static const comedi_lrange cb_pcidas_ranges = {
+static const struct comedi_lrange cb_pcidas_ranges = {
        8,
        {
                        BIP_RANGE(10),
@@ -211,7 +211,7 @@ static const comedi_lrange cb_pcidas_ranges = {
 };
 
 // pci-das1001 input ranges
-static const comedi_lrange cb_pcidas_alt_ranges = {
+static const struct comedi_lrange cb_pcidas_alt_ranges = {
        8,
        {
                        BIP_RANGE(10),
@@ -226,7 +226,7 @@ static const comedi_lrange cb_pcidas_alt_ranges = {
 };
 
 // analog output ranges
-static const comedi_lrange cb_pcidas_ao_ranges = {
+static const struct comedi_lrange cb_pcidas_ao_ranges = {
        4,
        {
                        BIP_RANGE(5),
@@ -241,7 +241,7 @@ enum trimpot_model {
        AD8402,
 };
 
-typedef struct cb_pcidas_board_struct {
+struct cb_pcidas_board {
        const char *name;
        unsigned short device_id;
        int ai_se_chans;        // Inputs in single-ended mode
@@ -252,12 +252,12 @@ typedef struct cb_pcidas_board_struct {
        int has_ao_fifo;        // analog output has fifo
        int ao_scan_speed;      // analog output speed for 1602 series (for a scan, not conversion)
        int fifo_size;          // number of samples fifo can hold
-       const comedi_lrange *ranges;
+       const struct comedi_lrange *ranges;
        enum trimpot_model trimpot;
        unsigned has_dac08:1;
-} cb_pcidas_board;
+};
 
-static const cb_pcidas_board cb_pcidas_boards[] = {
+static const struct cb_pcidas_board cb_pcidas_boards[] = {
        {
              name:     "pci-das1602/16",
              device_id:0x1,
@@ -375,7 +375,7 @@ static const cb_pcidas_board cb_pcidas_boards[] = {
 };
 
 // Number of boards in cb_pcidas_boards
-#define N_BOARDS       (sizeof(cb_pcidas_boards) / sizeof(cb_pcidas_board))
+#define N_BOARDS       (sizeof(cb_pcidas_boards) / sizeof(struct cb_pcidas_board))
 
 static DEFINE_PCI_DEVICE_TABLE(cb_pcidas_pci_table) = {
        {PCI_VENDOR_ID_CB, 0x0001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
@@ -394,12 +394,12 @@ MODULE_DEVICE_TABLE(pci, cb_pcidas_pci_table);
 /*
  * Useful for shorthand access to the particular board structure
  */
-#define thisboard ((const cb_pcidas_board *)dev->board_ptr)
+#define thisboard ((const struct cb_pcidas_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_pcidas_private {
        /* would be useful for a PCI device */
        struct pci_dev *pci_dev;
        // base addresses
@@ -426,47 +426,48 @@ typedef struct {
        unsigned int trimpot_value[NUM_CHANNELS_8402];  // for readback of trimpot
        unsigned int dac08_value;
        unsigned int calibration_source;
-} cb_pcidas_private;
+};
 
 /*
  * most drivers define the following macro to make it easy to
  * access the private structure.
  */
-#define devpriv ((cb_pcidas_private *)dev->private)
+#define devpriv ((struct cb_pcidas_private *)dev->private)
 
 /*
- * The comedi_driver structure tells the Comedi core module
+ * 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 cb_pcidas_attach(struct comedi_device * dev, comedi_devconfig * it);
+static int cb_pcidas_attach(struct comedi_device * dev, struct comedi_devconfig * it);
 static int cb_pcidas_detach(struct comedi_device * dev);
-static comedi_driver driver_cb_pcidas = {
+static struct comedi_driver driver_cb_pcidas = {
       driver_name:"cb_pcidas",
       module:THIS_MODULE,
       attach:cb_pcidas_attach,
       detach:cb_pcidas_detach,
 };
 
-static int cb_pcidas_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+static int cb_pcidas_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice * s,
+       struct comedi_insn * insn, unsigned int * data);
 static int ai_config_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+       struct comedi_insn * insn, unsigned int * data);
 static int cb_pcidas_ao_nofifo_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_pcidas_ao_fifo_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_pcidas_ao_readback_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+       struct comedi_insn * insn, unsigned int * data);
 static int cb_pcidas_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s);
 static int cb_pcidas_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_cmd * cmd);
+       struct comedi_cmd * cmd);
 static int cb_pcidas_ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s);
-static int cb_pcidas_ao_inttrig(struct comedi_device * dev, struct comedi_subdevice * subdev,
-       unsigned int trig_num);
+static int cb_pcidas_ao_inttrig(struct comedi_device *dev,
+                               struct comedi_subdevice *subdev,
+                               unsigned int trig_num);
 static int cb_pcidas_ao_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_cmd * cmd);
+       struct comedi_cmd * cmd);
 static irqreturn_t cb_pcidas_interrupt(int irq, void *d PT_REGS_ARG);
 static void handle_ao_interrupt(struct comedi_device * dev, unsigned int status);
 static int cb_pcidas_cancel(struct comedi_device * dev, struct comedi_subdevice * s);
@@ -474,22 +475,22 @@ static int cb_pcidas_ao_cancel(struct comedi_device * dev, struct comedi_subdevi
 static void cb_pcidas_load_counters(struct comedi_device * dev, unsigned int *ns,
        int round_flags);
 static int eeprom_read_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+       struct comedi_insn * insn, unsigned int * data);
 static int caldac_read_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+       struct comedi_insn * insn, unsigned int * data);
 static int caldac_write_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+       struct comedi_insn * insn, unsigned int * data);
 static int trimpot_read_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+       struct comedi_insn * insn, unsigned int * data);
 static int cb_pcidas_trimpot_write(struct comedi_device * dev, unsigned int channel,
        unsigned int value);
 static int trimpot_write_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+       struct comedi_insn * insn, unsigned int * data);
 static int dac08_read_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+       struct comedi_insn * insn, unsigned int * data);
 static int dac08_write(struct comedi_device * dev, unsigned int value);
 static int dac08_write_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data);
+       struct comedi_insn * insn, unsigned int * data);
 static int caldac_8800_write(struct comedi_device * dev, unsigned int address,
        uint8_t value);
 static int trimpot_7376_write(struct comedi_device * dev, uint8_t value);
@@ -507,7 +508,7 @@ static inline unsigned int cal_enable_bits(struct comedi_device * dev)
  * Attach is called by the Comedi core to configure the driver
  * for a particular board.
  */
-static int cb_pcidas_attach(struct comedi_device * dev, comedi_devconfig * it)
+static int cb_pcidas_attach(struct comedi_device * dev, struct comedi_devconfig * it)
 {
        struct comedi_subdevice *s;
        struct pci_dev *pcidev;
@@ -519,7 +520,7 @@ static int cb_pcidas_attach(struct comedi_device * dev, comedi_devconfig * it)
 /*
  * Allocate the private structure area.
  */
-       if (alloc_private(dev, sizeof(cb_pcidas_private)) < 0)
+       if (alloc_private(dev, sizeof(struct cb_pcidas_private)) < 0)
                return -ENOMEM;
 
 /*
@@ -753,7 +754,7 @@ static int cb_pcidas_detach(struct comedi_device * dev)
  * mode.
  */
 static int cb_pcidas_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 bits;
@@ -820,7 +821,7 @@ static int ai_config_calibration_source(struct comedi_device * dev, unsigned int
 }
 
 static int ai_config_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        int id = data[0];
 
@@ -837,7 +838,7 @@ static int ai_config_insn(struct comedi_device * dev, struct comedi_subdevice *
 
 // analog output insn for pcidas-1000 and 1200 series
 static int cb_pcidas_ao_nofifo_winsn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        int channel;
        unsigned long flags;
@@ -862,7 +863,7 @@ static int cb_pcidas_ao_nofifo_winsn(struct comedi_device * dev, struct comedi_s
 
 // analog output insn for pcidas-1602 series
 static int cb_pcidas_ao_fifo_winsn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        int channel;
        unsigned long flags;
@@ -893,7 +894,7 @@ static int cb_pcidas_ao_fifo_winsn(struct comedi_device * dev, struct comedi_sub
 // analog output readback insn
 // XXX loses track of analog output value back after an analog ouput command is executed
 static int cb_pcidas_ao_readback_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        data[0] = devpriv->ao_value[CR_CHAN(insn->chanspec)];
 
@@ -901,7 +902,7 @@ static int cb_pcidas_ao_readback_insn(struct comedi_device * dev, struct comedi_
 }
 
 static int eeprom_read_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        uint8_t nvram_data;
        int retval;
@@ -916,7 +917,7 @@ static int eeprom_read_insn(struct comedi_device * dev, struct comedi_subdevice
 }
 
 static int caldac_write_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        const unsigned int channel = CR_CHAN(insn->chanspec);
 
@@ -924,7 +925,7 @@ static int caldac_write_insn(struct comedi_device * dev, struct comedi_subdevice
 }
 
 static int caldac_read_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        data[0] = devpriv->caldac_value[CR_CHAN(insn->chanspec)];
 
@@ -953,13 +954,13 @@ static int dac08_write(struct comedi_device * dev, unsigned int value)
 }
 
 static int dac08_write_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        return dac08_write(dev, data[0]);
 }
 
 static int dac08_read_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        data[0] = devpriv->dac08_value;
 
@@ -990,7 +991,7 @@ static int cb_pcidas_trimpot_write(struct comedi_device * dev,
 }
 
 static int trimpot_write_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        unsigned int channel = CR_CHAN(insn->chanspec);
 
@@ -998,7 +999,7 @@ static int trimpot_write_insn(struct comedi_device * dev, struct comedi_subdevic
 }
 
 static int trimpot_read_insn(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_insn * insn, unsigned int * data)
+       struct comedi_insn * insn, unsigned int * data)
 {
        unsigned int channel = CR_CHAN(insn->chanspec);
 
@@ -1008,7 +1009,7 @@ static int trimpot_read_insn(struct comedi_device * dev, struct comedi_subdevice
 }
 
 static int cb_pcidas_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_cmd * cmd)
+       struct comedi_cmd * cmd)
 {
        int err = 0;
        int tmp;
@@ -1164,8 +1165,8 @@ static int cb_pcidas_ai_cmdtest(struct comedi_device * dev, struct comedi_subdev
 
 static int cb_pcidas_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s)
 {
-       comedi_async *async = s->async;
-       comedi_cmd *cmd = &async->cmd;
+       struct comedi_async *async = s->async;
+       struct comedi_cmd *cmd = &async->cmd;
        unsigned int bits;
        unsigned long flags;
 
@@ -1250,7 +1251,7 @@ static int cb_pcidas_ai_cmd(struct comedi_device * dev, struct comedi_subdevice
 }
 
 static int cb_pcidas_ao_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s,
-       comedi_cmd * cmd)
+       struct comedi_cmd * cmd)
 {
        int err = 0;
        int tmp;
@@ -1364,8 +1365,8 @@ static int cb_pcidas_ao_cmdtest(struct comedi_device * dev, struct comedi_subdev
 
 static int cb_pcidas_ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s)
 {
-       comedi_async *async = s->async;
-       comedi_cmd *cmd = &async->cmd;
+       struct comedi_async *async = s->async;
+       struct comedi_cmd *cmd = &async->cmd;
        unsigned int i;
        unsigned long flags;
 
@@ -1425,12 +1426,13 @@ static int cb_pcidas_ao_cmd(struct comedi_device * dev, struct comedi_subdevice
        return 0;
 }
 
-static int cb_pcidas_ao_inttrig(struct comedi_device * dev, struct comedi_subdevice * s,
-       unsigned int trig_num)
+static int cb_pcidas_ao_inttrig(struct comedi_device *dev,
+                               struct comedi_subdevice *s,
+                               unsigned int trig_num)
 {
        unsigned int num_bytes, num_points = thisboard->fifo_size;
-       comedi_async *async = s->async;
-       comedi_cmd *cmd = &s->async->cmd;
+       struct comedi_async *async = s->async;
+       struct comedi_cmd *cmd = &s->async->cmd;
        unsigned long flags;
 
        if (trig_num != 0)
@@ -1478,7 +1480,7 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d PT_REGS_ARG)
 {
        struct comedi_device *dev = (struct comedi_device *) d;
        struct comedi_subdevice *s = dev->read_subdev;
-       comedi_async *async;
+       struct comedi_async *async;
        int status, s5933_status;
        int half_fifo = thisboard->fifo_size / 2;
        unsigned int num_samples, i;
@@ -1589,8 +1591,8 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d PT_REGS_ARG)
 static void handle_ao_interrupt(struct comedi_device * dev, unsigned int status)
 {
        struct comedi_subdevice *s = dev->write_subdev;
-       comedi_async *async = s->async;
-       comedi_cmd *cmd = &async->cmd;
+       struct comedi_async *async = s->async;
+       struct comedi_cmd *cmd = &async->cmd;
        unsigned int half_fifo = thisboard->fifo_size / 2;
        unsigned int num_points;
        unsigned int flags;
@@ -1642,7 +1644,7 @@ static void handle_ao_interrupt(struct comedi_device * dev, unsigned int status)
        comedi_event(dev, s);
 }
 
-// cancel analog input command
+/* cancel analog input command */
 static int cb_pcidas_cancel(struct comedi_device * dev, struct comedi_subdevice * s)
 {
        unsigned long flags;
@@ -1661,8 +1663,9 @@ static int cb_pcidas_cancel(struct comedi_device * dev, struct comedi_subdevice
        return 0;
 }
 
-// cancel analog output command
-static int cb_pcidas_ao_cancel(struct comedi_device * dev, struct comedi_subdevice * s)
+/* cancel analog output command */
+static int cb_pcidas_ao_cancel(struct comedi_device *dev,
+                              struct comedi_subdevice *s)
 {
        unsigned long flags;