From 83244ed200aafe7fd2a45a99cf65b18ef73f1791 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:20:36 -0400 Subject: [PATCH] --- yaml --- r: 141655 b: refs/heads/master c: 055f6636d9eb27bc13236e07739e019496c21221 h: refs/heads/master i: 141653: 5675952a94aa72004621109bd211e5cbc5f737eb 141651: 50bcf063f237feae0570b3ef1491fb5816abc12e 141647: 192471163ea9a0f005cbae5c34e8c27044fff751 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/pcmuio.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cb1c5881c1bc..25934f643a7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e56ab7156f5f4918eb89a19b3061de1a7fe69354 +refs/heads/master: 055f6636d9eb27bc13236e07739e019496c21221 diff --git a/trunk/drivers/staging/comedi/drivers/pcmuio.c b/trunk/drivers/staging/comedi/drivers/pcmuio.c index 89cf5d417748..4e7d8b6327fd 100644 --- a/trunk/drivers/staging/comedi/drivers/pcmuio.c +++ b/trunk/drivers/staging/comedi/drivers/pcmuio.c @@ -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 */ @@ -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 @@ -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; }