Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141627
b: refs/heads/master
c: 6dc1ece
h: refs/heads/master
i:
  141625: 89bf076
  141623: 1996bd6
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 0ff1835 commit 609d09c
Show file tree
Hide file tree
Showing 2 changed files with 7 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: 39eb312d648b530afd147a7c8198f7536f441a94
refs/heads/master: 6dc1ece008ab4e2bdddec3eca6d326a16b4f9849
10 changes: 6 additions & 4 deletions trunk/drivers/staging/comedi/drivers/s526.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,8 @@ static const s526_board s526_boards[] = {
/* 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 s526_private {

int data;

/* would be useful for a PCI device */
Expand All @@ -202,12 +203,13 @@ typedef struct {

s526_gpct_config_t s526_gpct_config[4];
unsigned short s526_ai_config;
} s526_private;
};

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

/*
* The struct comedi_driver structure tells the Comedi core module
Expand Down Expand Up @@ -307,7 +309,7 @@ static int s526_attach(struct comedi_device * dev, struct comedi_devconfig * it)
* Allocate the private structure area. alloc_private() is a
* convenient macro defined in comedidev.h.
*/
if (alloc_private(dev, sizeof(s526_private)) < 0)
if (alloc_private(dev, sizeof(struct s526_private)) < 0)
return -ENOMEM;

/*
Expand Down

0 comments on commit 609d09c

Please sign in to comment.