From deead9d973f4e225447f77bc4f128864fefd9a88 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 25 Jan 2013 18:35:55 -0700 Subject: [PATCH] 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/ni_labpc_cs.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c index 64fe4b2..ef3c0ef 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 */ -- 2.7.4