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

staging: comedi: cb_das16_cs: remove unused pcmcia 'stop' logic

The pcmcia support code in this driver appears to be cut-and-
paste from some other driver. It has code in it to stop the
device during suspend but nothing in the main comedi_driver
uses it.

Remove the 'stop' variable from the pcmcia private data and
all the logic that deals with it.
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 c2107ff4
...@@ -625,7 +625,6 @@ static int das16cs_timer_insn_config(struct comedi_device *dev, ...@@ -625,7 +625,6 @@ static int das16cs_timer_insn_config(struct comedi_device *dev,
struct local_info_t { struct local_info_t {
struct pcmcia_device *link; struct pcmcia_device *link;
int stop;
struct bus_operations *bus; struct bus_operations *bus;
}; };
...@@ -674,7 +673,6 @@ static int das16cs_pcmcia_attach(struct pcmcia_device *link) ...@@ -674,7 +673,6 @@ static int das16cs_pcmcia_attach(struct pcmcia_device *link)
static void das16cs_pcmcia_detach(struct pcmcia_device *link) static void das16cs_pcmcia_detach(struct pcmcia_device *link)
{ {
((struct local_info_t *)link->priv)->stop = 1;
pcmcia_disable_device(link); pcmcia_disable_device(link);
/* This points to the parent struct local_info_t struct */ /* This points to the parent struct local_info_t struct */
kfree(link->priv); kfree(link->priv);
...@@ -683,19 +681,11 @@ static void das16cs_pcmcia_detach(struct pcmcia_device *link) ...@@ -683,19 +681,11 @@ static void das16cs_pcmcia_detach(struct pcmcia_device *link)
static int das16cs_pcmcia_suspend(struct pcmcia_device *link) static int das16cs_pcmcia_suspend(struct pcmcia_device *link)
{ {
struct local_info_t *local = link->priv;
/* Mark the device as stopped, to block IO until later */
local->stop = 1;
return 0; return 0;
} }
static int das16cs_pcmcia_resume(struct pcmcia_device *link) static int das16cs_pcmcia_resume(struct pcmcia_device *link)
{ {
struct local_info_t *local = link->priv;
local->stop = 0;
return 0; return 0;
} }
......
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