summaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorH Hartley Sweeten2013-01-25 22:59:36 +0100
committerGreg Kroah-Hartman2013-01-30 05:06:40 +0100
commit86be5680f5804690654519751ed77aaa54b01826 (patch)
treefbf9d7fb701afdc0efde39a73aa97c3e2f880630 /drivers/staging/comedi
parentstaging: comedi: quatech_daqp_cs: remove forward declarations (diff)
downloadkernel-qcow2-linux-86be5680f5804690654519751ed77aaa54b01826.tar.gz
kernel-qcow2-linux-86be5680f5804690654519751ed77aaa54b01826.tar.xz
kernel-qcow2-linux-86be5680f5804690654519751ed77aaa54b01826.zip
staging: comedi: quatech_daqp_cs: remove daqp_cs_release()
This function justs emits a dev_dbg() message then calls pcmcia_disable_device(). The dev_dbg() is just added noise. Remove the function and just call pcmcia_disable_device(). 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>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r--drivers/staging/comedi/drivers/quatech_daqp_cs.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index 748aa6a7a88a..b2b755f031b1 100644
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -936,13 +936,6 @@ static int daqp_cs_resume(struct pcmcia_device *link)
return 0;
}
-static void daqp_cs_release(struct pcmcia_device *link)
-{
- dev_dbg(&link->dev, "daqp_cs_release\n");
-
- pcmcia_disable_device(link);
-}
-
static int daqp_pcmcia_config_loop(struct pcmcia_device *p_dev, void *priv_data)
{
if (p_dev->config_index == 0)
@@ -976,7 +969,7 @@ static void daqp_cs_config(struct pcmcia_device *link)
return;
failed:
- daqp_cs_release(link);
+ pcmcia_disable_device(link);
}
static int daqp_cs_attach(struct pcmcia_device *link)
@@ -1014,7 +1007,7 @@ static void daqp_cs_detach(struct pcmcia_device *link)
struct local_info_t *dev = link->priv;
dev->stop = 1;
- daqp_cs_release(link);
+ pcmcia_disable_device(link);
/* Unlink device structure, and free it */
dev_table[dev->table_index] = NULL;