From c33b950060d1a542329ab2b51916de83ea797a76 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:18:54 -0400 Subject: [PATCH] --- yaml --- r: 141675 b: refs/heads/master c: e21ffa44f55ebf7f6f7d1e60a49463ca579c056a h: refs/heads/master i: 141673: fe1f4d578a35824ccfd9783473100dc0926e168d 141671: c90b2070786e8b71d23c73984372f04f52f974bd v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/serial2002.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 32ddbd131d2b..2af64999324d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 404d108d8f5968f47ba72417a3532f213e020914 +refs/heads/master: e21ffa44f55ebf7f6f7d1e60a49463ca579c056a diff --git a/trunk/drivers/staging/comedi/drivers/serial2002.c b/trunk/drivers/staging/comedi/drivers/serial2002.c index 0e48887b55cb..844fd5e2e3a9 100644 --- a/trunk/drivers/staging/comedi/drivers/serial2002.c +++ b/trunk/drivers/staging/comedi/drivers/serial2002.c @@ -68,7 +68,8 @@ struct serial2002_range_table_t { }; -typedef struct { +struct serial2002_private { + int port; // /dev/ttyS int speed; // baudrate struct file *tty; @@ -79,13 +80,14 @@ typedef struct { unsigned char analog_out_mapping[32]; unsigned char encoder_in_mapping[32]; struct serial2002_range_table_t in_range[32], out_range[32]; -} serial2002_private; +}; + /* * most drivers define the following macro to make it easy to * access the private structure. */ -#define devpriv ((serial2002_private *)dev->private) +#define devpriv ((struct serial2002_private *)dev->private) static int serial2002_attach(struct comedi_device * dev, struct comedi_devconfig * it); static int serial2002_detach(struct comedi_device * dev); @@ -786,7 +788,7 @@ static int serial2002_attach(struct comedi_device * dev, struct comedi_devconfig printk("comedi%d: serial2002: ", dev->minor); dev->board_name = thisboard->name; - if (alloc_private(dev, sizeof(serial2002_private)) < 0) { + if (alloc_private(dev, sizeof(struct serial2002_private)) < 0) { return -ENOMEM; } dev->open = serial_2002_open;