From 74e90ada0ab38364fc6c17be788d44992882c6a7 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Thu, 19 Mar 2009 17:58:51 -0400 Subject: [PATCH] --- yaml --- r: 141684 b: refs/heads/master c: 6179e3e9bbec5df830ccca3970df80967347b410 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_65xx.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f70d97e275f3..48d9ad1b53f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47c30a2cc336d493d624d8437f41c19a270bb672 +refs/heads/master: 6179e3e9bbec5df830ccca3970df80967347b410 diff --git a/trunk/drivers/staging/comedi/drivers/ni_65xx.c b/trunk/drivers/staging/comedi/drivers/ni_65xx.c index 4f6e77879338..6e85da16a241 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_65xx.c +++ b/trunk/drivers/staging/comedi/drivers/ni_65xx.c @@ -295,17 +295,18 @@ static inline struct ni_65xx_private *private(struct comedi_device * dev) return dev->private; } -typedef struct { +struct ni_65xx_subdevice_private { unsigned base_port; -} ni_65xx_subdevice_private; -static inline ni_65xx_subdevice_private *sprivate(struct comedi_subdevice * subdev) +}; + +static inline struct ni_65xx_subdevice_private *sprivate(struct comedi_subdevice * subdev) { return subdev->private; } -static ni_65xx_subdevice_private *ni_65xx_alloc_subdevice_private(void) +static struct ni_65xx_subdevice_private *ni_65xx_alloc_subdevice_private(void) { - ni_65xx_subdevice_private *subdev_private = - kzalloc(sizeof(ni_65xx_subdevice_private), GFP_KERNEL); + struct ni_65xx_subdevice_private *subdev_private = + kzalloc(sizeof(struct ni_65xx_subdevice_private), GFP_KERNEL); if (subdev_private == NULL) return NULL; return subdev_private;