Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141562
b: refs/heads/master
c: c77e258
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent fe44f2a commit 87d78df
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: 5c2670cba2a5fd1a27f938ae11b3a24518d999db
refs/heads/master: c77e25898523395b56e1d120195e1ad2e3efa14d
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/cb_pcidas.c
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ MODULE_DEVICE_TABLE(pci, cb_pcidas_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_pcidas_private {
/* would be useful for a PCI device */
struct pci_dev *pci_dev;
// base addresses
Expand All @@ -426,13 +426,13 @@ typedef struct {
unsigned int trimpot_value[NUM_CHANNELS_8402]; // for readback of trimpot
unsigned int dac08_value;
unsigned int calibration_source;
} cb_pcidas_private;
};

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

/*
* The struct comedi_driver structure tells the Comedi core module
Expand Down Expand Up @@ -520,7 +520,7 @@ static int cb_pcidas_attach(struct comedi_device * dev, struct comedi_devconfig
/*
* Allocate the private structure area.
*/
if (alloc_private(dev, sizeof(cb_pcidas_private)) < 0)
if (alloc_private(dev, sizeof(struct cb_pcidas_private)) < 0)
return -ENOMEM;

/*
Expand Down

0 comments on commit 87d78df

Please sign in to comment.