summaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorH Hartley Sweeten2013-01-26 02:36:16 +0100
committerGreg Kroah-Hartman2013-01-30 05:09:24 +0100
commit4fc76ea03f5f847e7c70cd81849b2c825119ef78 (patch)
treef3f32626ab825155ee7ef162af0ae51abbf6db49 /drivers/staging/comedi
parentstaging: comedi: ni_labpc_cs: remove 'stop' from private pcmcia data (diff)
downloadkernel-qcow2-linux-4fc76ea03f5f847e7c70cd81849b2c825119ef78.tar.gz
kernel-qcow2-linux-4fc76ea03f5f847e7c70cd81849b2c825119ef78.tar.xz
kernel-qcow2-linux-4fc76ea03f5f847e7c70cd81849b2c825119ef78.zip
staging: comedi: ni_labpc_cs: remove pcmcia_driver suspend/resume
The pcmcia_driver suspend and resume functions in this driver don't do anything. Since they are optional just remove them. 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/ni_labpc_cs.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index ef3c0efb60d9..30b2dddb17b1 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -155,8 +155,6 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
}
static void labpc_config(struct pcmcia_device *link);
-static int labpc_cs_suspend(struct pcmcia_device *p_dev);
-static int labpc_cs_resume(struct pcmcia_device *p_dev);
static int labpc_cs_attach(struct pcmcia_device *);
static void labpc_cs_detach(struct pcmcia_device *);
@@ -233,16 +231,6 @@ failed:
pcmcia_disable_device(link);
}
-static int labpc_cs_suspend(struct pcmcia_device *link)
-{
- return 0;
-} /* labpc_cs_suspend */
-
-static int labpc_cs_resume(struct pcmcia_device *link)
-{
- return 0;
-} /* labpc_cs_resume */
-
static const struct pcmcia_device_id labpc_cs_ids[] = {
/* N.B. These IDs should match those in labpc_cs_boards (ni_labpc.c) */
PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0103), /* daqcard-1200 */
@@ -256,8 +244,6 @@ static struct pcmcia_driver labpc_cs_driver = {
.id_table = labpc_cs_ids,
.probe = labpc_cs_attach,
.remove = labpc_cs_detach,
- .suspend = labpc_cs_suspend,
- .resume = labpc_cs_resume,
};
module_comedi_pcmcia_driver(driver_labpc_cs, labpc_cs_driver);