diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2013-01-25 18:35:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-29 23:09:24 -0500 |
| commit | 88dd3eb4d8cb335166df779bcaabab9d1c5fa513 (patch) | |
| tree | 85b34a23c72bae8bff2a2168e5c5ac646586290d | |
| parent | 098303caaf3a24e43a67d9a6e7d2f7d3033a601f (diff) | |
| download | blackbird-obmc-linux-88dd3eb4d8cb335166df779bcaabab9d1c5fa513.tar.gz blackbird-obmc-linux-88dd3eb4d8cb335166df779bcaabab9d1c5fa513.zip | |
staging: comedi: ni_labpc_cs: remove labpc_release()
The function simply calls pcmcia_disable_device(). Remove it and
just call pcmcia_disable_device() where needed.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc_cs.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c index f2c7ab62a1c5..64fe4b248ee9 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_cs.c +++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c @@ -155,7 +155,6 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) } static void labpc_config(struct pcmcia_device *link); -static void labpc_release(struct pcmcia_device *link); static int labpc_cs_suspend(struct pcmcia_device *p_dev); static int labpc_cs_resume(struct pcmcia_device *p_dev); @@ -191,7 +190,7 @@ 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; - labpc_release(link); + pcmcia_disable_device(link); /* This points to the parent local_info_t struct (may be null) */ kfree(link->priv); @@ -233,16 +232,8 @@ static void labpc_config(struct pcmcia_device *link) return; failed: - labpc_release(link); - -} /* labpc_config */ - -static void labpc_release(struct pcmcia_device *link) -{ - dev_dbg(&link->dev, "labpc_release\n"); - pcmcia_disable_device(link); -} /* labpc_release */ +} static int labpc_cs_suspend(struct pcmcia_device *link) { |
