Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de46fb77 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_daq_dio24: remove dio24_release() 



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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7b725aae

drivers/staging/comedi/drivers/ni_daq_dio24.c

+2 −16
Original line number Original line Diff line number Diff line
@@ -185,12 +185,6 @@ static void dio24_detach(struct comedi_device *dev) 
};

};





static void dio24_config(struct pcmcia_device *link);

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 local_info_t {

	struct pcmcia_device *link;

	struct pcmcia_device *link;
@@ -223,7 +217,7 @@ static int dio24_cs_attach(struct pcmcia_device *link) 
static void dio24_cs_detach(struct pcmcia_device *link)

static void dio24_cs_detach(struct pcmcia_device *link)

{

{

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

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

	dio24_release(link);

	pcmcia_disable_device(link);





	/* This points to the parent local_info_t struct */

	/* This points to the parent local_info_t struct */

	kfree(link->priv);

	kfree(link->priv);
@@ -266,16 +260,8 @@ static void dio24_config(struct pcmcia_device *link) 




failed:

failed:

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

	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);

	pcmcia_disable_device(link);

}				/* dio24_release */

}





static int dio24_cs_suspend(struct pcmcia_device *link)

static int dio24_cs_suspend(struct pcmcia_device *link)

{

{