From 7970a4c849cf2403576292f2a37ea3c38a7019b4 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:08:24 -0400 Subject: [PATCH] --- yaml --- r: 141535 b: refs/heads/master c: 006449f0fe747774438d714dcc4c6193d3a801ea h: refs/heads/master i: 141533: 58a1e8f419dbde76e0d851352e8e872f37fb030b 141531: 714a1f3349b87dcd8d99c9e71dc2fa5907c32430 141527: 8689d057e62ba9657b22c6fa3011255d58c7007a 141519: daef630f1cf972f2b8f3d299b1087072651cab70 141503: 8556f76fe6bfb871f7885e263d2aa25497e0421f v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/adv_pci1723.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index eb1356969b87..e132277e4388 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e8131a86d6c1a9896282f572d17c447a85262ad +refs/heads/master: 006449f0fe747774438d714dcc4c6193d3a801ea diff --git a/trunk/drivers/staging/comedi/drivers/adv_pci1723.c b/trunk/drivers/staging/comedi/drivers/adv_pci1723.c index f6492fa3e9a9..81f7ee18c150 100644 --- a/trunk/drivers/staging/comedi/drivers/adv_pci1723.c +++ b/trunk/drivers/staging/comedi/drivers/adv_pci1723.c @@ -102,7 +102,7 @@ static const struct comedi_lrange range_pci1723 = { 1, { /* * Board descriptions for pci1723 boards. */ -typedef struct pci1723_board_struct { +struct pci1723_board { const char *name; int vendor_id; // PCI vendor a device ID of card int device_id; @@ -112,9 +112,9 @@ typedef struct pci1723_board_struct { int n_diochan; // num of DIO chans int ao_maxdata; // resolution of D/A const struct comedi_lrange *rangelist_ao; // rangelist for D/A -} boardtype; +}; -static const boardtype boardtypes[] = { +static const struct pci1723_board boardtypes[] = { { name: "pci1723", vendor_id:ADVANTECH_VENDOR, @@ -146,7 +146,7 @@ MODULE_DEVICE_TABLE(pci, pci1723_pci_table); static int pci1723_attach(struct comedi_device * dev, struct comedi_devconfig * it); static int pci1723_detach(struct comedi_device * dev); -#define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype)) +#define n_boardtypes (sizeof(boardtypes)/sizeof(struct pci1723_board)) static struct comedi_driver driver_pci1723 = { driver_name:"adv_pci1723", @@ -156,19 +156,19 @@ static struct comedi_driver driver_pci1723 = { }; /* this structure is for data unique to this hardware driver. */ -typedef struct { +struct pci1723_private { int valid; //card is usable; struct pci_dev *pcidev; unsigned char da_range[8]; // D/A output range for each channel short ao_data[8]; // data output buffer -} pci1723_private; +}; /*the following macro to make it easy to * access the private structure. */ -#define devpriv ((pci1723_private *)dev->private) +#define devpriv ((struct pci1723_private *)dev->private) #define this_board boardtypes @@ -310,7 +310,7 @@ static int pci1723_attach(struct comedi_device * dev, struct comedi_devconfig * opt_bus = it->options[0]; opt_slot = it->options[1]; - if ((ret = alloc_private(dev, sizeof(pci1723_private))) < 0) { + if ((ret = alloc_private(dev, sizeof(struct pci1723_private))) < 0) { rt_printk(" - Allocation failed!\n"); return -ENOMEM; }