Commit f19d8578 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: cb_das16_cs: refactor the pcmcia support code

Refactor the pcmcia support code to remove the need for the
forward declarations.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1b19f53e
...@@ -623,48 +623,16 @@ static int das16cs_timer_insn_config(struct comedi_device *dev, ...@@ -623,48 +623,16 @@ static int das16cs_timer_insn_config(struct comedi_device *dev,
return -EINVAL; return -EINVAL;
} }
static void das16cs_pcmcia_config(struct pcmcia_device *link);
static void das16cs_pcmcia_release(struct pcmcia_device *link);
static int das16cs_pcmcia_suspend(struct pcmcia_device *p_dev);
static int das16cs_pcmcia_resume(struct pcmcia_device *p_dev);
static int das16cs_pcmcia_attach(struct pcmcia_device *);
static void das16cs_pcmcia_detach(struct pcmcia_device *);
struct local_info_t { struct local_info_t {
struct pcmcia_device *link; struct pcmcia_device *link;
int stop; int stop;
struct bus_operations *bus; struct bus_operations *bus;
}; };
static int das16cs_pcmcia_attach(struct pcmcia_device *link) static void das16cs_pcmcia_release(struct pcmcia_device *link)
{
struct local_info_t *local;
dev_dbg(&link->dev, "das16cs_pcmcia_attach()\n");
/* 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;
cur_dev = link;
das16cs_pcmcia_config(link);
return 0;
}
static void das16cs_pcmcia_detach(struct pcmcia_device *link)
{ {
dev_dbg(&link->dev, "das16cs_pcmcia_detach\n"); dev_dbg(&link->dev, "das16cs_pcmcia_release\n");
pcmcia_disable_device(link);
((struct local_info_t *)link->priv)->stop = 1;
das16cs_pcmcia_release(link);
/* This points to the parent struct local_info_t struct */
kfree(link->priv);
} }
static int das16cs_pcmcia_config_loop(struct pcmcia_device *p_dev, static int das16cs_pcmcia_config_loop(struct pcmcia_device *p_dev,
...@@ -704,10 +672,34 @@ static void das16cs_pcmcia_config(struct pcmcia_device *link) ...@@ -704,10 +672,34 @@ static void das16cs_pcmcia_config(struct pcmcia_device *link)
das16cs_pcmcia_release(link); das16cs_pcmcia_release(link);
} }
static void das16cs_pcmcia_release(struct pcmcia_device *link) static int das16cs_pcmcia_attach(struct pcmcia_device *link)
{ {
dev_dbg(&link->dev, "das16cs_pcmcia_release\n"); struct local_info_t *local;
pcmcia_disable_device(link);
dev_dbg(&link->dev, "das16cs_pcmcia_attach()\n");
/* 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;
cur_dev = link;
das16cs_pcmcia_config(link);
return 0;
}
static void das16cs_pcmcia_detach(struct pcmcia_device *link)
{
dev_dbg(&link->dev, "das16cs_pcmcia_detach\n");
((struct local_info_t *)link->priv)->stop = 1;
das16cs_pcmcia_release(link);
/* This points to the parent struct local_info_t struct */
kfree(link->priv);
} }
static int das16cs_pcmcia_suspend(struct pcmcia_device *link) static int das16cs_pcmcia_suspend(struct pcmcia_device *link)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment