openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: ni_labpc_cs: remove pcmcia_device private data 

The private data, struct local_info_t, is not being used in the
driver. Remove it as well as the kzalloc/kfree.

Also, don't set the 'pcmcia_cur_dev' variable unless the pcmcia
configuration is successful.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-01-25 18:37:06 -07:00 committed by Greg Kroah-Hartman
parent fdcb5fdee2
commit b2e1be03ac
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/comedi/drivers/ni_labpc_cs.c
View File

@ -154,11 +154,6 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return labpc_common_attach(dev, iobase, irq, 0); return labpc_common_attach(dev, iobase, irq, 0);
} }
struct local_info_t {
struct pcmcia_device *link;
struct bus_operations *bus;
};
static int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev, static int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev,
void *priv_data) void *priv_data)
{ {
@ -170,17 +165,8 @@ static int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev,
static int labpc_cs_attach(struct pcmcia_device *link) static int labpc_cs_attach(struct pcmcia_device *link)
{ {
struct local_info_t *local;
int ret; int ret;
local = kzalloc(sizeof(*local), GFP_KERNEL);
if (!local)
return -ENOMEM;
local->link = link;
link->priv = local;
pcmcia_cur_dev = link;
link->config_flags |= CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ | link->config_flags |= CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ |
CONF_AUTO_AUDIO | CONF_AUTO_SET_IO; CONF_AUTO_AUDIO | CONF_AUTO_SET_IO;
@ -197,6 +183,8 @@ static int labpc_cs_attach(struct pcmcia_device *link)
if (ret) if (ret)
goto failed; goto failed;
pcmcia_cur_dev = link;
return 0; return 0;
failed: failed:
@ -207,9 +195,6 @@ static int labpc_cs_attach(struct pcmcia_device *link)
static void labpc_cs_detach(struct pcmcia_device *link) static void labpc_cs_detach(struct pcmcia_device *link)
{ {
pcmcia_disable_device(link); pcmcia_disable_device(link);
/* This points to the parent local_info_t struct (may be null) */
kfree(link->priv);
} }
static const struct pcmcia_device_id labpc_cs_ids[] = { static const struct pcmcia_device_id labpc_cs_ids[] = {