From c8b2ae2b98bad7870ec6be24e517bacffd76ea8e Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Mon, 25 Jun 2012 16:20:36 -0700
Subject: [PATCH] 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>
---
drivers/staging/comedi/drivers/cb_das16_cs.c | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index 5171cfe29b08d..151a559854543 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;
}
--
2.30.2