Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141566
b: refs/heads/master
c: fe7858a
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent e832399 commit 53a7cf1
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: c98d3debeb1101858f7bd720116d00e15ae9124d
refs/heads/master: fe7858af4f04d6ea5d18a513433846c63c70d0ec
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/cb_pcidio.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ MODULE_DEVICE_TABLE(pci, pcidio_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 pcidio_private {
int data; // curently unused

/* would be useful for a PCI device */
Expand All @@ -113,13 +113,13 @@ typedef struct {
unsigned int do_readback[4]; /* up to 4 unsigned int suffice to hold 96 bits for PCI-DIO96 */

unsigned long dio_reg_base; // address of port A of the first 8255 chip on board
} pcidio_private;
};

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

/*
* The struct comedi_driver structure tells the Comedi core module
Expand Down Expand Up @@ -178,7 +178,7 @@ static int pcidio_attach(struct comedi_device * dev, struct comedi_devconfig * i
* Allocate the private structure area. alloc_private() is a
* convenient macro defined in comedidev.h.
*/
if (alloc_private(dev, sizeof(pcidio_private)) < 0)
if (alloc_private(dev, sizeof(struct pcidio_private)) < 0)
return -ENOMEM;
/*
* If you can probe the device to determine what device in a series
Expand Down

0 comments on commit 53a7cf1

Please sign in to comment.