summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/cb_das16_cs.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-06-25 16:20:36 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-26 15:20:20 -0700
commitc8b2ae2b98bad7870ec6be24e517bacffd76ea8e (patch)
tree1494b1368365668f7d1f46c22ffd903a90718a5e /drivers/staging/comedi/drivers/cb_das16_cs.c
parentc2107ff46d58a9db6d8cadcbe18fa631fb4f7cd9 (diff)
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: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/cb_das16_cs.c')
-rw-r--r--drivers/staging/comedi/drivers/cb_das16_cs.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index 5171cfe29b08..151a55985454 100644
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -625,7 +625,6 @@ static int das16cs_timer_insn_config(struct comedi_device *dev,
struct local_info_t {
struct pcmcia_device *link;
- int stop;
struct bus_operations *bus;
};
@@ -674,7 +673,6 @@ failed:
static void das16cs_pcmcia_detach(struct pcmcia_device *link)
{
- ((struct local_info_t *)link->priv)->stop = 1;
pcmcia_disable_device(link);
/* This points to the parent struct local_info_t struct */
kfree(link->priv);
@@ -683,19 +681,11 @@ static void das16cs_pcmcia_detach(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;
}
static int das16cs_pcmcia_resume(struct pcmcia_device *link)
{
- struct local_info_t *local = link->priv;
-
- local->stop = 0;
return 0;
}