From dbf9e3f4c17fe3d6096b0569229f6cd94634b6f8 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 30 Jan 2013 16:42:31 -0700 Subject: [PATCH] --- yaml --- r: 354318 b: refs/heads/master c: 0bfc02b8e58abcc0c1f03638a34650c3eaee36f9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 5769b1127486..ceeb8fcd1cd6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de46fb7776da0565fa71cb407c7eb45ce87676b9 +refs/heads/master: 0bfc02b8e58abcc0c1f03638a34650c3eaee36f9 diff --git a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c index a9b38dd122f6..51c25ac0dcae 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c @@ -188,7 +188,6 @@ static void dio24_config(struct pcmcia_device *link); struct local_info_t { struct pcmcia_device *link; - int stop; struct bus_operations *bus; }; @@ -216,7 +215,6 @@ static int dio24_cs_attach(struct pcmcia_device *link) static void dio24_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 */ @@ -265,18 +263,11 @@ static void dio24_config(struct pcmcia_device *link) static int dio24_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; } /* dio24_cs_suspend */ static int dio24_cs_resume(struct pcmcia_device *link) { - struct local_info_t *local = link->priv; - - local->stop = 0; return 0; } /* dio24_cs_resume */