From 471427e40b1b4dfb2f0e9d94f3a32295914f1248 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 25 Jan 2013 18:36:16 -0700 Subject: [PATCH] --- yaml --- r: 354255 b: refs/heads/master c: 4fc76ea03f5f847e7c70cd81849b2c825119ef78 h: refs/heads/master i: 354253: 125519bf73427b8abbe2f313eaa4a67bfe5d3554 354251: 42121272ccc1edbf829eacb45c85a4fcee899ed2 354247: 28b251cd4e1c360b3957205d315479e1adc2adf5 354239: 0e89c249cc27a1da43e82cb1b74881ef701acc17 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 06c53f6ff51a..b22fd75f59a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: deead9d973f4e225447f77bc4f128864fefd9a88 +refs/heads/master: 4fc76ea03f5f847e7c70cd81849b2c825119ef78 diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c b/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c index ef3c0efb60d9..30b2dddb17b1 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c +++ b/trunk/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 @@ static void labpc_config(struct pcmcia_device *link) 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);