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 b0366e8..fcc5516 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -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
@@ -255,9 +255,9 @@ typedef struct cb_pcidas_board_struct {
        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,13 +426,13 @@ 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 struct comedi_driver structure tells the Comedi core module
@@ -520,7 +520,7 @@ static int cb_pcidas_attach(struct comedi_device * dev, struct comedi_devconfig
 /*
  * 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;
 
 /*