Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141663
b: refs/heads/master
c: b90c76f
h: refs/heads/master
i:
  141661: 9d043e8
  141659: 357112b
  141655: 83244ed
  141647: 1924711
  141631: 414aaed
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent adbdca3 commit 34b72d8
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: 502dd07999b48994dc3c86a0c44f1a684299d44f
refs/heads/master: b90c76fd78a101835eb1cc17271d008ed51688d3
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/cb_pcimdas.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ MODULE_DEVICE_TABLE(pci, cb_pcimdas_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_pcimdas_private {
int data;

// would be useful for a PCI device
Expand All @@ -161,13 +161,13 @@ typedef struct {
unsigned short int port_c; // copy of BADR4+2
unsigned short int dio_mode; // copy of BADR4+3

} cb_pcimdas_private;
};

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

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

/*
Expand Down

0 comments on commit 34b72d8

Please sign in to comment.