From 381303c3ddefe7c8ac2538b174ca7abb5a179b1f Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:15:34 -0400 Subject: [PATCH] --- yaml --- r: 141612 b: refs/heads/master c: 16450130a9f7006c91c9f49d725b9029fe711240 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/mpc624.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3a81f7a9d2eb..a35f3220b76e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9beff277bb14a844b5cb437fcdca9db7534ee44a +refs/heads/master: 16450130a9f7006c91c9f49d725b9029fe711240 diff --git a/trunk/drivers/staging/comedi/drivers/mpc624.c b/trunk/drivers/staging/comedi/drivers/mpc624.c index ee053f149dd9..a151602929d9 100644 --- a/trunk/drivers/staging/comedi/drivers/mpc624.c +++ b/trunk/drivers/staging/comedi/drivers/mpc624.c @@ -120,11 +120,13 @@ Configuration Options: #define MPC624_SPEED_13_75_Hz (MPC624_OSR4 | MPC624_OSR3 | MPC624_OSR0) #define MPC624_SPEED_6_875_Hz (MPC624_OSR4 | MPC624_OSR3 | MPC624_OSR2 | MPC624_OSR1 | MPC624_OSR0) //---------------------------------------------------------------------------- -typedef struct { +struct skel_private { + unsigned long int ulConvertionRate; // set by mpc624_attach() from driver's parameters -} skel_private; +}; + -#define devpriv ((skel_private *)dev->private) +#define devpriv ((struct skel_private *)dev->private) //---------------------------------------------------------------------------- static const struct comedi_lrange range_mpc624_bipolar1 = { 1, @@ -174,7 +176,7 @@ static int mpc624_attach(struct comedi_device * dev, struct comedi_devconfig * i dev->board_name = "mpc624"; // Private structure initialization - if (alloc_private(dev, sizeof(skel_private)) < 0) + if (alloc_private(dev, sizeof(struct skel_private)) < 0) return -ENOMEM; switch (it->options[1]) {