Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68c3dbff authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: fix the way structs are initialized. 



Change from the foo: bar format to the .foo = bar format.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent dae0dc30

drivers/staging/comedi/drivers/8255.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

drivers/staging/comedi/drivers/acl7225b.c

+7 −7
Original line number Diff line number Diff line
@@ -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);

drivers/staging/comedi/drivers/addi-data/addi_common.c

+8 −8
Original line number Diff line number Diff line
@@ -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,
@@ -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);

drivers/staging/comedi/drivers/adl_pci6208.c

+16 −16
Original line number Diff line number Diff line
@@ -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 */

		}

};
@@ -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);

drivers/staging/comedi/drivers/adl_pci7296.c

+4 −4
Original line number Diff line number Diff line
@@ -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)