2012-06-22 23:38:05

by Hartley Sweeten

[permalink] [raw]
Subject: [PATCH 28/31] staging: comedi: ni_daq_700: 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 <[email protected]>
Cc: Ian Abbott <[email protected]>
Cc: Frank Mori Hess <[email protected]>
Cc: Greg Kroah-hartman <[email protected]>
---
drivers/staging/comedi/drivers/ni_daq_700.c | 9 ---------
1 file changed, 9 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index bb857ac4..b02ed37 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -212,7 +212,6 @@ failed:

struct local_info_t {
struct pcmcia_device *link;
- int stop;
struct bus_operations *bus;
};

@@ -238,7 +237,6 @@ static int dio700_cs_attach(struct pcmcia_device *link)

static void dio700_cs_detach(struct pcmcia_device *link)
{
- ((struct local_info_t *)link->priv)->stop = 1;
dio700_release(link);

/* This points to the parent struct local_info_t struct */
@@ -247,18 +245,11 @@ static void dio700_cs_detach(struct pcmcia_device *link)

static int dio700_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;
}

static int dio700_cs_resume(struct pcmcia_device *link)
{
- struct local_info_t *local = link->priv;
-
- local->stop = 0;
return 0;
}

--
1.7.11