From b9a7899594a6a37a3fc315968dc52378e2ed5285 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:18:27 -0400 Subject: [PATCH] --- yaml --- r: 141635 b: refs/heads/master c: e1c8638f3fb47c25b8dba170aadc8e29619fcd67 h: refs/heads/master i: 141633: 3f836f3fb01cfaed5ecd4e63442efca1dad26743 141631: 414aaed9f9d0f58a267c48c101faab5eb3e7ea1b v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/pcl711.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e5e52de2c795..08b34325e09d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e2269f90f2bb4e9438849f0690daba5cba29fc5 +refs/heads/master: e1c8638f3fb47c25b8dba170aadc8e29619fcd67 diff --git a/trunk/drivers/staging/comedi/drivers/pcl711.c b/trunk/drivers/staging/comedi/drivers/pcl711.c index 3e83b6cf693e..fefbe1ca654a 100644 --- a/trunk/drivers/staging/comedi/drivers/pcl711.c +++ b/trunk/drivers/staging/comedi/drivers/pcl711.c @@ -168,7 +168,8 @@ static struct comedi_driver driver_pcl711 = { COMEDI_INITCLEANUP(driver_pcl711); -typedef struct { +struct pcl711_private { + int board; int adchan; int ntrig; @@ -177,9 +178,10 @@ typedef struct { unsigned int ao_readback[2]; unsigned int divisor1; unsigned int divisor2; -} pcl711_private; +}; + -#define devpriv ((pcl711_private *)dev->private) +#define devpriv ((struct pcl711_private *)dev->private) static irqreturn_t pcl711_interrupt(int irq, void *d PT_REGS_ARG) { @@ -548,7 +550,7 @@ static int pcl711_attach(struct comedi_device * dev, struct comedi_devconfig * i if ((ret = alloc_subdevices(dev, 4)) < 0) return ret; - if ((ret = alloc_private(dev, sizeof(pcl711_private))) < 0) + if ((ret = alloc_private(dev, sizeof(struct pcl711_private))) < 0) return ret; s = dev->subdevices + 0;