Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141564
b: refs/heads/master
c: cc7bb61
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent ede6962 commit d919c78
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: 1657e325042ffc723182377a47d38ccc7319078f
refs/heads/master: cc7bb61e00a2e9e4e0d742b9917cb37406080922
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/cb_pcidda.c
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ MODULE_DEVICE_TABLE(pci, cb_pcidda_pci_table);
/* 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_pcidda_private {
int data;

/* would be useful for a PCI device */
Expand All @@ -224,13 +224,13 @@ typedef struct {
unsigned int dac_cal1_bits; // bits last written to da calibration register 1
unsigned int ao_range[MAX_AO_CHANNELS]; // current range settings for output channels
u16 eeprom_data[EEPROM_SIZE]; // software copy of board's eeprom
} cb_pcidda_private;
};

/*
* most drivers define the following macro to make it easy to
* access the private structure.
*/
#define devpriv ((cb_pcidda_private *)dev->private)
#define devpriv ((struct cb_pcidda_private *)dev->private)

static int cb_pcidda_attach(struct comedi_device * dev, struct comedi_devconfig * it);
static int cb_pcidda_detach(struct comedi_device * dev);
Expand Down Expand Up @@ -276,7 +276,7 @@ static int cb_pcidda_attach(struct comedi_device * dev, struct comedi_devconfig
/*
* Allocate the private structure area.
*/
if (alloc_private(dev, sizeof(cb_pcidda_private)) < 0)
if (alloc_private(dev, sizeof(struct cb_pcidda_private)) < 0)
return -ENOMEM;

/*
Expand Down

0 comments on commit d919c78

Please sign in to comment.