From: H Hartley Sweeten Date: Wed, 30 Jan 2013 23:42:31 +0000 (-0700) Subject: staging: comedi: ni_daq_dio24: remove 'stop' from private pcmcia data X-Git-Tag: firefly_0821_release~3680^2~1080^2~184 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0bfc02b8e58abcc0c1f03638a34650c3eaee36f9;p=firefly-linux-kernel-4.4.55.git staging: comedi: ni_daq_dio24: 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 --- diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c index a9b38dd122f6..51c25ac0dcae 100644 --- a/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/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 @@ failed: 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 */