summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2013-01-25 18:35:55 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-29 23:09:24 -0500
commitdeead9d973f4e225447f77bc4f128864fefd9a88 (patch)
treec18debf0cb52b2e610c98225f0c80d54e87f710c
parent88dd3eb4d8cb335166df779bcaabab9d1c5fa513 (diff)
staging: comedi: ni_labpc_cs: remove 'stop' from private pcmcia data
The pcmcia_driver suspend and remove functions set the 'stop' variable and the resume function clears it. Nothing in the comedi_driver code uses the 'stop' variable. Just remove it so we can get rid of the suspend/resume. 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>
-rw-r--r--drivers/staging/comedi/drivers/ni_labpc_cs.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index 64fe4b248ee9..ef3c0efb60d9 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -163,7 +163,6 @@ static void labpc_cs_detach(struct pcmcia_device *);
struct local_info_t {
struct pcmcia_device *link;
- int stop;
struct bus_operations *bus;
};
@@ -189,7 +188,6 @@ static int labpc_cs_attach(struct pcmcia_device *link)
static void labpc_cs_detach(struct pcmcia_device *link)
{
- ((struct local_info_t *)link->priv)->stop = 1;
pcmcia_disable_device(link);
/* This points to the parent local_info_t struct (may be null) */
@@ -237,18 +235,11 @@ failed:
static int labpc_cs_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;
} /* labpc_cs_suspend */
static int labpc_cs_resume(struct pcmcia_device *link)
{
- struct local_info_t *local = link->priv;
-
- local->stop = 0;
return 0;
} /* labpc_cs_resume */