Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141535
b: refs/heads/master
c: 006449f
h: refs/heads/master
i:
  141533: 58a1e8f
  141531: 714a1f3
  141527: 8689d05
  141519: daef630
  141503: 8556f76
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 045365c commit 7970a4c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6e8131a86d6c1a9896282f572d17c447a85262ad
refs/heads/master: 006449f0fe747774438d714dcc4c6193d3a801ea
16 changes: 8 additions & 8 deletions trunk/drivers/staging/comedi/drivers/adv_pci1723.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand Down Expand Up @@ -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",
Expand All @@ -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

Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 7970a4c

Please sign in to comment.