Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141655
b: refs/heads/master
c: 055f663
h: refs/heads/master
i:
  141653: 5675952
  141651: 50bcf06
  141647: 1924711
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent eafeb1e commit 83244ed
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: e56ab7156f5f4918eb89a19b3061de1a7fe69354
refs/heads/master: 055f6636d9eb27bc13236e07739e019496c21221
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/pcmuio.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ struct pcmuio_subdev_private {
/* 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 pcmuio_private {
struct {
unsigned char pagelock; /* current page and lock */
unsigned char pol[NUM_PAGED_REGS]; /* shadow of POLx registers */
Expand All @@ -208,13 +208,13 @@ typedef struct {
spinlock_t spinlock;
} asics[MAX_ASICS];
struct pcmuio_subdev_private *sprivs;
} pcmuio_private;
};

/*
* most drivers define the following macro to make it easy to
* access the private structure.
*/
#define devpriv ((pcmuio_private *)dev->private)
#define devpriv ((struct pcmuio_private *)dev->private)
#define subpriv ((struct pcmuio_subdev_private *)s->private)
/*
* The struct comedi_driver structure tells the Comedi core module
Expand Down Expand Up @@ -312,7 +312,7 @@ static int pcmuio_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(pcmuio_private)) < 0) {
if (alloc_private(dev, sizeof(struct pcmuio_private)) < 0) {
printk("cannot allocate private data structure\n");
return -ENOMEM;
}
Expand Down

0 comments on commit 83244ed

Please sign in to comment.