mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-13 17:28:56 +00:00
staging: comedi: cb_das16_cs: remove unneeded pcmcia private data
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>
This commit is contained in:
parent
2b5f548082
commit
bc314fb53f
@ -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)
|
||||
{
|
||||
@ -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;
|
||||
|
||||
@ -674,8 +661,6 @@ failed:
|
||||
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;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user