From 609d09cc224c8bd01c9aaec62cb4b3bdf5d27491 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:17:38 -0400 Subject: [PATCH] --- yaml --- r: 141627 b: refs/heads/master c: 6dc1ece008ab4e2bdddec3eca6d326a16b4f9849 h: refs/heads/master i: 141625: 89bf07651fe5f8f194ec8ef4e94bbdc87fb091db 141623: 1996bd6f165432477005147a1cfc4a3789f1b2ac v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/s526.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6d189ee7ff20..fd04968a491d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39eb312d648b530afd147a7c8198f7536f441a94 +refs/heads/master: 6dc1ece008ab4e2bdddec3eca6d326a16b4f9849 diff --git a/trunk/drivers/staging/comedi/drivers/s526.c b/trunk/drivers/staging/comedi/drivers/s526.c index 08666e637e47..d112515feccd 100644 --- a/trunk/drivers/staging/comedi/drivers/s526.c +++ b/trunk/drivers/staging/comedi/drivers/s526.c @@ -191,7 +191,8 @@ static const s526_board s526_boards[] = { /* 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 s526_private { + int data; /* would be useful for a PCI device */ @@ -202,12 +203,13 @@ typedef struct { s526_gpct_config_t s526_gpct_config[4]; unsigned short s526_ai_config; -} s526_private; +}; + /* * most drivers define the following macro to make it easy to * access the private structure. */ -#define devpriv ((s526_private *)dev->private) +#define devpriv ((struct s526_private *)dev->private) /* * The struct comedi_driver structure tells the Comedi core module @@ -307,7 +309,7 @@ static int s526_attach(struct comedi_device * dev, struct comedi_devconfig * it) * Allocate the private structure area. alloc_private() is a * convenient macro defined in comedidev.h. */ - if (alloc_private(dev, sizeof(s526_private)) < 0) + if (alloc_private(dev, sizeof(struct s526_private)) < 0) return -ENOMEM; /*