Skip to content

Commit

Permalink
staging: comedi: das08_cs: refactor the pcmcia support code
Browse files Browse the repository at this point in the history
Refactor the pcmcia support code to remove the need for the
forward declarations.

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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 6, 2012
1 parent c332d96 commit fb79574
Showing 1 changed file with 39 additions and 48 deletions.
87 changes: 39 additions & 48 deletions drivers/staging/comedi/drivers/das08_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,54 +104,12 @@ static int das08_cs_attach(struct comedi_device *dev,
return das08_common_attach(dev, iobase);
}

static void das08_pcmcia_config(struct pcmcia_device *link);
static void das08_pcmcia_release(struct pcmcia_device *link);
static int das08_pcmcia_suspend(struct pcmcia_device *p_dev);
static int das08_pcmcia_resume(struct pcmcia_device *p_dev);

static int das08_pcmcia_attach(struct pcmcia_device *);
static void das08_pcmcia_detach(struct pcmcia_device *);

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

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

dev_dbg(&link->dev, "das08_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;

das08_pcmcia_config(link);

return 0;
}

static void das08_pcmcia_detach(struct pcmcia_device *link)
static void das08_pcmcia_release(struct pcmcia_device *link)
{

dev_dbg(&link->dev, "das08_pcmcia_detach\n");

((struct local_info_t *)link->priv)->stop = 1;
das08_pcmcia_release(link);

/* This points to the parent struct local_info_t struct */
kfree(link->priv);

dev_dbg(&link->dev, "das08_pcmcia_release\n");
pcmcia_disable_device(link);
}


static int das08_pcmcia_config_loop(struct pcmcia_device *p_dev,
void *priv_data)
{
Expand Down Expand Up @@ -189,10 +147,43 @@ static void das08_pcmcia_config(struct pcmcia_device *link)

}

static void das08_pcmcia_release(struct pcmcia_device *link)
struct local_info_t {
struct pcmcia_device *link;
int stop;
struct bus_operations *bus;
};

static int das08_pcmcia_attach(struct pcmcia_device *link)
{
dev_dbg(&link->dev, "das08_pcmcia_release\n");
pcmcia_disable_device(link);
struct local_info_t *local;

dev_dbg(&link->dev, "das08_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;

das08_pcmcia_config(link);

return 0;
}

static void das08_pcmcia_detach(struct pcmcia_device *link)
{

dev_dbg(&link->dev, "das08_pcmcia_detach\n");

((struct local_info_t *)link->priv)->stop = 1;
das08_pcmcia_release(link);

/* This points to the parent struct local_info_t struct */
kfree(link->priv);

}

static int das08_pcmcia_suspend(struct pcmcia_device *link)
Expand Down

0 comments on commit fb79574

Please sign in to comment.