From 11c365594271947052ec40932b58d64cdaf9c83d Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 25 Jan 2013 18:35:55 -0700 Subject: [PATCH] --- yaml --- r: 354254 b: refs/heads/master c: deead9d973f4e225447f77bc4f128864fefd9a88 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 907daf1e9df2..06c53f6ff51a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88dd3eb4d8cb335166df779bcaabab9d1c5fa513 +refs/heads/master: deead9d973f4e225447f77bc4f128864fefd9a88 diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c b/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c index 64fe4b248ee9..ef3c0efb60d9 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c +++ b/trunk/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 @@ static void labpc_config(struct pcmcia_device *link) 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 */