Skip to content

Commit

Permalink
staging: comedi: ni_labpc_cs: move pcmcia_driver functions
Browse files Browse the repository at this point in the history
For aesthetic reasons, move all the pcmcia_driver functions so they
are near the pcmcia_driver declaration. This also removes the need
for some of 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 Jan 30, 2013
1 parent 4fc76ea commit 00cefaa
Showing 1 changed file with 28 additions and 35 deletions.
63 changes: 28 additions & 35 deletions drivers/staging/comedi/drivers/ni_labpc_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,45 +154,11 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return labpc_common_attach(dev, iobase, irq, 0);
}

static void labpc_config(struct pcmcia_device *link);

static int labpc_cs_attach(struct pcmcia_device *);
static void labpc_cs_detach(struct pcmcia_device *);

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

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

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

pcmcia_cur_dev = link;

labpc_config(link);

return 0;
} /* labpc_cs_attach */

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 int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev,
void *priv_data)
{
Expand All @@ -202,7 +168,6 @@ static int labpc_pcmcia_config_loop(struct pcmcia_device *p_dev,
return pcmcia_request_io(p_dev);
}


static void labpc_config(struct pcmcia_device *link)
{
int ret;
Expand Down Expand Up @@ -231,6 +196,34 @@ static void labpc_config(struct pcmcia_device *link)
pcmcia_disable_device(link);
}

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

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

pcmcia_cur_dev = link;

labpc_config(link);

return 0;
}

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[] = {
/* N.B. These IDs should match those in labpc_cs_boards (ni_labpc.c) */
PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0103), /* daqcard-1200 */
Expand Down

0 comments on commit 00cefaa

Please sign in to comment.