Skip to content

Commit

Permalink
staging: comedi: ni_daq_dio24: remove dio24_release()
Browse files Browse the repository at this point in the history
This function simply calls pcmcia_disable_device(). Remove it and
just call pcmcia_disable_device() where needed.

Also, remove a couple unnecessary 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 Feb 4, 2013
1 parent 7b725aa commit de46fb7
Showing 1 changed file with 2 additions and 16 deletions.
18 changes: 2 additions & 16 deletions drivers/staging/comedi/drivers/ni_daq_dio24.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,6 @@ static void dio24_detach(struct comedi_device *dev)
};

static void dio24_config(struct pcmcia_device *link);
static void dio24_release(struct pcmcia_device *link);
static int dio24_cs_suspend(struct pcmcia_device *p_dev);
static int dio24_cs_resume(struct pcmcia_device *p_dev);

static int dio24_cs_attach(struct pcmcia_device *);
static void dio24_cs_detach(struct pcmcia_device *);

struct local_info_t {
struct pcmcia_device *link;
Expand Down Expand Up @@ -223,7 +217,7 @@ static int dio24_cs_attach(struct pcmcia_device *link)
static void dio24_cs_detach(struct pcmcia_device *link)
{
((struct local_info_t *)link->priv)->stop = 1;
dio24_release(link);
pcmcia_disable_device(link);

/* This points to the parent local_info_t struct */
kfree(link->priv);
Expand Down Expand Up @@ -266,16 +260,8 @@ static void dio24_config(struct pcmcia_device *link)

failed:
dev_info(&link->dev, "Fallo");
dio24_release(link);

} /* dio24_config */

static void dio24_release(struct pcmcia_device *link)
{
dev_dbg(&link->dev, "dio24_release\n");

pcmcia_disable_device(link);
} /* dio24_release */
}

static int dio24_cs_suspend(struct pcmcia_device *link)
{
Expand Down

0 comments on commit de46fb7

Please sign in to comment.