From 0fcf693f654ddbc9615fd66875be4441afe540d0 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 25 Jan 2013 18:37:06 -0700 Subject: [PATCH] --- yaml --- r: 354258 b: refs/heads/master c: b2e1be03ac1747cbb758fa146fe5cf364f306420 h: refs/heads/master v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/ni_labpc_cs.c | 19 ++----------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index c489bf894100..80ea4d78f12e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdcb5fdee2c7ec6327d08f4529da7e1130d0fa63 +refs/heads/master: b2e1be03ac1747cbb758fa146fe5cf364f306420 diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c b/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c index e3ea13d84500..831411d50ebb 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c +++ b/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c @@ -154,11 +154,6 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) 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, 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) { - struct local_info_t *local; 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 | CONF_AUTO_AUDIO | CONF_AUTO_SET_IO; @@ -197,6 +183,8 @@ static int labpc_cs_attach(struct pcmcia_device *link) if (ret) goto failed; + pcmcia_cur_dev = link; + return 0; failed: @@ -207,9 +195,6 @@ static int labpc_cs_attach(struct pcmcia_device *link) static void labpc_cs_detach(struct pcmcia_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[] = {