From: Bill Pemberton Date: Thu, 19 Mar 2009 21:59:39 +0000 (-0400) Subject: Staging: comedi: ni_daq_700.c: Remove local_info_t typedef X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=30570f0dee2b0e3ede09e08eb5dfd514317a7587;p=linux-2.6-omap-h63xx.git Staging: comedi: ni_daq_700.c: Remove local_info_t typedef Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index 1e40348430e..61a31ad2d03 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c @@ -479,12 +479,12 @@ static void dio700_cs_detach(struct pcmcia_device *); static const dev_info_t dev_info = "ni_daq_700"; -typedef struct local_info_t { +struct local_info_t { struct pcmcia_device *link; dev_node_t node; int stop; struct bus_operations *bus; -} local_info_t; +}; /*====================================================================== @@ -500,14 +500,14 @@ typedef struct local_info_t { static int dio700_cs_attach(struct pcmcia_device *link) { - local_info_t *local; + struct local_info_t *local; printk(KERN_INFO "ni_daq_700: cs-attach\n"); DEBUG(0, "dio700_cs_attach()\n"); /* Allocate space for private device-specific data */ - local = kzalloc(sizeof(local_info_t), GFP_KERNEL); + local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL); if (!local) return -ENOMEM; local->link = link; @@ -552,11 +552,11 @@ static void dio700_cs_detach(struct pcmcia_device *link) DEBUG(0, "dio700_cs_detach(0x%p)\n", link); if (link->dev_node) { - ((local_info_t *) link->priv)->stop = 1; + ((struct local_info_t *) link->priv)->stop = 1; dio700_release(link); } - /* This points to the parent local_info_t struct */ + /* This points to the parent struct local_info_t struct */ if (link->priv) kfree(link->priv); @@ -572,7 +572,7 @@ static void dio700_cs_detach(struct pcmcia_device *link) static void dio700_config(struct pcmcia_device *link) { - local_info_t *dev = link->priv; + struct local_info_t *dev = link->priv; tuple_t tuple; cisparse_t parse; int last_ret; @@ -772,7 +772,7 @@ static void dio700_release(struct pcmcia_device *link) static int dio700_cs_suspend(struct pcmcia_device *link) { - local_info_t *local = link->priv; + struct local_info_t *local = link->priv; /* Mark the device as stopped, to block IO until later */ local->stop = 1; @@ -781,7 +781,7 @@ static int dio700_cs_suspend(struct pcmcia_device *link) static int dio700_cs_resume(struct pcmcia_device *link) { - local_info_t *local = link->priv; + struct local_info_t *local = link->priv; local->stop = 0; return 0;