Skip to content

Commit

Permalink
Staging: comedi: fix the way structs are initialized.
Browse files Browse the repository at this point in the history
Change from the foo: bar format to the .foo = bar format.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Jun 19, 2009
1 parent dae0dc3 commit 68c3dbf
Show file tree
Hide file tree
Showing 91 changed files with 2,674 additions and 2,674 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/comedi/drivers/8255.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ struct subdev_8255_struct {
static int dev_8255_attach(struct comedi_device *dev, struct comedi_devconfig * it);
static int dev_8255_detach(struct comedi_device *dev);
static struct comedi_driver driver_8255 = {
driver_name:"8255",
module:THIS_MODULE,
attach:dev_8255_attach,
detach:dev_8255_detach,
.driver_name = "8255",
.module = THIS_MODULE,
.attach = dev_8255_attach,
.detach = dev_8255_detach,
};

COMEDI_INITCLEANUP(driver_8255);
Expand Down
14 changes: 7 additions & 7 deletions drivers/staging/comedi/drivers/acl7225b.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ static const struct boardtype boardtypes[] = {
#define this_board ((const struct boardtype *)dev->board_ptr)

static struct comedi_driver driver_acl7225b = {
driver_name:"acl7225b",
module:THIS_MODULE,
attach:acl7225b_attach,
detach:acl7225b_detach,
board_name:&boardtypes[0].name,
num_names:n_boardtypes,
offset:sizeof(struct boardtype),
.driver_name = "acl7225b",
.module = THIS_MODULE,
.attach = acl7225b_attach,
.detach = acl7225b_detach,
.board_name = &boardtypes[0].name,
.num_names = n_boardtypes,
.offset = sizeof(struct boardtype),
};

COMEDI_INITCLEANUP(driver_acl7225b);
Expand Down
16 changes: 8 additions & 8 deletions drivers/staging/comedi/drivers/addi-data/addi_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ static const struct addi_board boardtypes[] = {
NULL},
#endif
#ifdef CONFIG_APCI_3300
/* Begin JK 20.10.2004: APCI-3300 integration */
/* Begin JK .20.10.2004 = APCI-3300 integration */
{"apci3300",
APCI3200_BOARD_VENDOR_ID,
0x3007,
Expand Down Expand Up @@ -2528,13 +2528,13 @@ static const struct addi_board boardtypes[] = {
#define n_boardtypes (sizeof(boardtypes)/sizeof(struct addi_board))

struct comedi_driver driver_addi = {
driver_name:"addi_common",
module:THIS_MODULE,
attach:i_ADDI_Attach,
detach:i_ADDI_Detach,
num_names:n_boardtypes,
board_name:&boardtypes[0].pc_DriverName,
offset:sizeof(struct addi_board),
.driver_name = "addi_common",
.module = THIS_MODULE,
.attach = i_ADDI_Attach,
.detach = i_ADDI_Detach,
.num_names = n_boardtypes,
.board_name = &boardtypes[0].pc_DriverName,
.offset = sizeof(struct addi_board),
};

COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl);
Expand Down
32 changes: 16 additions & 16 deletions drivers/staging/comedi/drivers/adl_pci6208.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,22 @@ struct pci6208_board {

static const struct pci6208_board pci6208_boards[] = {
/*{
name : "pci6208v",
dev_id : 0x6208, // not sure
ao_chans: 8
// , ao_bits : 16
.name = "pci6208v",
.dev_id = 0x6208, // not sure
.ao_chans = 8
// , .ao_bits = 16
},
{
name : "pci6216v",
dev_id : 0x6208, // not sure
ao_chans: 16
// , ao_bits : 16
.name = "pci6216v",
.dev_id = 0x6208, // not sure
.ao_chans = 16
// , .ao_bits = 16
}, */
{
name: "pci6208a",
dev_id: 0x6208,
ao_chans:8
/* , ao_bits : 16 */
.name = "pci6208a",
.dev_id = 0x6208,
.ao_chans = 8
/* , .ao_bits = 16 */
}
};

Expand Down Expand Up @@ -114,10 +114,10 @@ static int pci6208_detach(struct comedi_device *dev);
(sizeof(pci6208_boards) / sizeof(struct pci6208_board))

static struct comedi_driver driver_pci6208 = {
driver_name:PCI6208_DRIVER_NAME,
module:THIS_MODULE,
attach:pci6208_attach,
detach:pci6208_detach,
.driver_name = PCI6208_DRIVER_NAME,
.module = THIS_MODULE,
.attach = pci6208_attach,
.detach = pci6208_detach,
};

COMEDI_PCI_INITCLEANUP(driver_pci6208, pci6208_pci_table);
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/comedi/drivers/adl_pci7296.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ struct adl_pci7296_private {
static int adl_pci7296_attach(struct comedi_device *dev, struct comedi_devconfig *it);
static int adl_pci7296_detach(struct comedi_device *dev);
static struct comedi_driver driver_adl_pci7296 = {
driver_name:"adl_pci7296",
module:THIS_MODULE,
attach:adl_pci7296_attach,
detach:adl_pci7296_detach,
.driver_name = "adl_pci7296",
.module = THIS_MODULE,
.attach = adl_pci7296_attach,
.detach = adl_pci7296_detach,
};

static int adl_pci7296_attach(struct comedi_device *dev, struct comedi_devconfig *it)
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/comedi/drivers/adl_pci7432.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ struct adl_pci7432_private {
static int adl_pci7432_attach(struct comedi_device *dev, struct comedi_devconfig *it);
static int adl_pci7432_detach(struct comedi_device *dev);
static struct comedi_driver driver_adl_pci7432 = {
driver_name:"adl_pci7432",
module:THIS_MODULE,
attach:adl_pci7432_attach,
detach:adl_pci7432_detach,
.driver_name = "adl_pci7432",
.module = THIS_MODULE,
.attach = adl_pci7432_attach,
.detach = adl_pci7432_detach,
};

/* Digital IO */
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/comedi/drivers/adl_pci8164.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ struct adl_pci8164_private {
static int adl_pci8164_attach(struct comedi_device *dev, struct comedi_devconfig *it);
static int adl_pci8164_detach(struct comedi_device *dev);
static struct comedi_driver driver_adl_pci8164 = {
driver_name:"adl_pci8164",
module:THIS_MODULE,
attach:adl_pci8164_attach,
detach:adl_pci8164_detach,
.driver_name = "adl_pci8164",
.module = THIS_MODULE,
.attach = adl_pci8164_attach,
.detach = adl_pci8164_detach,
};

static int adl_pci8164_insn_read_msts(struct comedi_device *dev, struct comedi_subdevice *s,
Expand Down
30 changes: 15 additions & 15 deletions drivers/staging/comedi/drivers/adl_pci9111.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,27 +309,27 @@ struct pci9111_board {

static const struct pci9111_board pci9111_boards[] = {
{
name: "pci9111_hr",
device_id:PCI9111_HR_DEVICE_ID,
ai_channel_nbr:PCI9111_AI_CHANNEL_NBR,
ao_channel_nbr:PCI9111_AO_CHANNEL_NBR,
ai_resolution:PCI9111_HR_AI_RESOLUTION,
ai_resolution_mask:PCI9111_HR_AI_RESOLUTION_MASK,
ao_resolution:PCI9111_AO_RESOLUTION,
ao_resolution_mask:PCI9111_AO_RESOLUTION_MASK,
ai_range_list:&pci9111_hr_ai_range,
ao_range_list:&range_bipolar10,
ai_acquisition_period_min_ns:PCI9111_AI_ACQUISITION_PERIOD_MIN_NS}
.name = "pci9111_hr",
.device_id = PCI9111_HR_DEVICE_ID,
.ai_channel_nbr = PCI9111_AI_CHANNEL_NBR,
.ao_channel_nbr = PCI9111_AO_CHANNEL_NBR,
.ai_resolution = PCI9111_HR_AI_RESOLUTION,
.ai_resolution_mask = PCI9111_HR_AI_RESOLUTION_MASK,
.ao_resolution = PCI9111_AO_RESOLUTION,
.ao_resolution_mask = PCI9111_AO_RESOLUTION_MASK,
.ai_range_list = &pci9111_hr_ai_range,
.ao_range_list = &range_bipolar10,
.ai_acquisition_period_min_ns = PCI9111_AI_ACQUISITION_PERIOD_MIN_NS}
};

#define pci9111_board_nbr \
(sizeof(pci9111_boards)/sizeof(struct pci9111_board))

static struct comedi_driver pci9111_driver = {
driver_name:PCI9111_DRIVER_NAME,
module:THIS_MODULE,
attach:pci9111_attach,
detach:pci9111_detach,
.driver_name = PCI9111_DRIVER_NAME,
.module = THIS_MODULE,
.attach = pci9111_attach,
.detach = pci9111_detach,
};

COMEDI_PCI_INITCLEANUP(pci9111_driver, pci9111_pci_table);
Expand Down
14 changes: 7 additions & 7 deletions drivers/staging/comedi/drivers/adl_pci9118.c
Original file line number Diff line number Diff line change
Expand Up @@ -231,13 +231,13 @@ static const struct boardtype boardtypes[] = {
#define n_boardtypes (sizeof(boardtypes)/sizeof(struct boardtype))

static struct comedi_driver driver_pci9118 = {
driver_name:"adl_pci9118",
module:THIS_MODULE,
attach:pci9118_attach,
detach:pci9118_detach,
num_names:n_boardtypes,
board_name:&boardtypes[0].name,
offset:sizeof(struct boardtype),
.driver_name = "adl_pci9118",
.module = THIS_MODULE,
.attach = pci9118_attach,
.detach = pci9118_detach,
.num_names = n_boardtypes,
.board_name = &boardtypes[0].name,
.offset = sizeof(struct boardtype),
};

COMEDI_PCI_INITCLEANUP(driver_pci9118, pci9118_pci_table);
Expand Down
22 changes: 11 additions & 11 deletions drivers/staging/comedi/drivers/adq12b.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,20 @@ struct adq12b_board {

static const struct adq12b_board adq12b_boards[] = {
{
name: "adq12b",
ai_se_chans: 16,
ai_diff_chans: 8,
ai_bits: 12,
di_chans: 5,
do_chans: 8
.name = "adq12b",
.ai_se_chans = 16,
.ai_diff_chans = 8,
.ai_bits = 12,
.di_chans = 5,
.do_chans = 8
}
// potentially, more adq-based deviced will be added
/*,
name: "adq12b",
ai_chans: 16, // this is just for reference, hardcoded again later
ai_bits: 12,
di_chans: 8,
do_chans: 5
.name = "adq12b",
.ai_chans = 16, // this is just for reference, hardcoded again later
.ai_bits = 12,
.di_chans = 8,
.do_chans = 5
}*/
};

Expand Down
26 changes: 13 additions & 13 deletions drivers/staging/comedi/drivers/adv_pci1723.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,15 @@ struct pci1723_board {

static const struct pci1723_board boardtypes[] = {
{
name: "pci1723",
vendor_id:ADVANTECH_VENDOR,
device_id:0x1723,
iorange: IORANGE_1723,
cardtype:TYPE_PCI1723,
n_aochan:8,
n_diochan:16,
ao_maxdata:0xffff,
rangelist_ao:&range_pci1723,
.name = "pci1723",
.vendor_id = ADVANTECH_VENDOR,
.device_id = 0x1723,
.iorange = IORANGE_1723,
.cardtype = TYPE_PCI1723,
.n_aochan = 8,
.n_diochan = 16,
.ao_maxdata = 0xffff,
.rangelist_ao = &range_pci1723,
},
};

Expand All @@ -149,10 +149,10 @@ static int pci1723_detach(struct comedi_device *dev);
#define n_boardtypes (sizeof(boardtypes)/sizeof(struct pci1723_board))

static struct comedi_driver driver_pci1723 = {
driver_name:"adv_pci1723",
module:THIS_MODULE,
attach:pci1723_attach,
detach:pci1723_detach,
.driver_name = "adv_pci1723",
.module = THIS_MODULE,
.attach = pci1723_attach,
.detach = pci1723_detach,
};

/* this structure is for data unique to this hardware driver. */
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/comedi/drivers/adv_pci_dio.c
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,10 @@ static const struct dio_boardtype boardtypes[] = {
#define n_boardtypes (sizeof(boardtypes)/sizeof(struct dio_boardtype))

static struct comedi_driver driver_pci_dio = {
driver_name:"adv_pci_dio",
module:THIS_MODULE,
attach:pci_dio_attach,
detach:pci_dio_detach
.driver_name = "adv_pci_dio",
.module = THIS_MODULE,
.attach = pci_dio_attach,
.detach = pci_dio_detach
};

struct pci_dio_private {
Expand Down
16 changes: 8 additions & 8 deletions drivers/staging/comedi/drivers/aio_aio12_8.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ struct aio12_8_boardtype {

static const struct aio12_8_boardtype board_types[] = {
{
name: "aio_aio12_8"},
.name = "aio_aio12_8"},
};

#define thisboard ((const struct aio12_8_boardtype *) dev->board_ptr)
Expand Down Expand Up @@ -214,13 +214,13 @@ static int aio_aio12_8_detach(struct comedi_device *dev)
}

static struct comedi_driver driver_aio_aio12_8 = {
driver_name:"aio_aio12_8",
module:THIS_MODULE,
attach:aio_aio12_8_attach,
detach:aio_aio12_8_detach,
board_name:&board_types[0].name,
num_names:1,
offset:sizeof(struct aio12_8_boardtype),
.driver_name = "aio_aio12_8",
.module = THIS_MODULE,
.attach = aio_aio12_8_attach,
.detach = aio_aio12_8_detach,
.board_name = &board_types[0].name,
.num_names = 1,
.offset = sizeof(struct aio12_8_boardtype),
};

COMEDI_INITCLEANUP(driver_aio_aio12_8);
20 changes: 10 additions & 10 deletions drivers/staging/comedi/drivers/aio_iiro_16.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ struct aio_iiro_16_board {

static const struct aio_iiro_16_board aio_iiro_16_boards[] = {
{
name: "aio_iiro_16",
di: 16,
do_: 16},
.name = "aio_iiro_16",
.di = 16,
.do_ = 16},
};

#define thisboard ((const struct aio_iiro_16_board *) dev->board_ptr)
Expand All @@ -72,13 +72,13 @@ static int aio_iiro_16_attach(struct comedi_device *dev, struct comedi_devconfig
static int aio_iiro_16_detach(struct comedi_device *dev);

static struct comedi_driver driver_aio_iiro_16 = {
driver_name:"aio_iiro_16",
module:THIS_MODULE,
attach:aio_iiro_16_attach,
detach:aio_iiro_16_detach,
board_name:&aio_iiro_16_boards[0].name,
offset:sizeof(struct aio_iiro_16_board),
num_names:sizeof(aio_iiro_16_boards) / sizeof(struct aio_iiro_16_board),
.driver_name = "aio_iiro_16",
.module = THIS_MODULE,
.attach = aio_iiro_16_attach,
.detach = aio_iiro_16_detach,
.board_name = &aio_iiro_16_boards[0].name,
.offset = sizeof(struct aio_iiro_16_board),
.num_names = sizeof(aio_iiro_16_boards) / sizeof(struct aio_iiro_16_board),
};

static int aio_iiro_16_dio_insn_bits_read(struct comedi_device *dev,
Expand Down
Loading

0 comments on commit 68c3dbf

Please sign in to comment.