Skip to content

Commit

Permalink
staging: comedi: cb_das16_cs: remove unneeded pcmcia private data
Browse files Browse the repository at this point in the history
The pcmcia device-specific data is not longer needed by this
driver. Remove it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 26, 2012
1 parent 2b5f548 commit bc314fb
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions drivers/staging/comedi/drivers/cb_das16_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -623,11 +623,6 @@ static int das16cs_timer_insn_config(struct comedi_device *dev,
return -EINVAL;
}

struct local_info_t {
struct pcmcia_device *link;
struct bus_operations *bus;
};

static int das16cs_pcmcia_config_loop(struct pcmcia_device *p_dev,
void *priv_data)
{
Expand All @@ -639,16 +634,8 @@ static int das16cs_pcmcia_config_loop(struct pcmcia_device *p_dev,

static int das16cs_pcmcia_attach(struct pcmcia_device *link)
{
struct local_info_t *local;
int ret;

/* Allocate space for private device-specific data */
local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL);
if (!local)
return -ENOMEM;
local->link = link;
link->priv = local;

/* Do we need to allocate an interrupt? */
link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;

Expand All @@ -674,8 +661,6 @@ static int das16cs_pcmcia_attach(struct pcmcia_device *link)
static void das16cs_pcmcia_detach(struct pcmcia_device *link)
{
pcmcia_disable_device(link);
/* This points to the parent struct local_info_t struct */
kfree(link->priv);
cur_dev = NULL;
}

Expand Down

0 comments on commit bc314fb

Please sign in to comment.