From 125519bf73427b8abbe2f313eaa4a67bfe5d3554 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 25 Jan 2013 18:35:39 -0700 Subject: [PATCH] --- yaml --- r: 354253 b: refs/heads/master c: 88dd3eb4d8cb335166df779bcaabab9d1c5fa513 h: refs/heads/master i: 354251: 42121272ccc1edbf829eacb45c85a4fcee899ed2 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index e78d1d0d306e..907daf1e9df2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 098303caaf3a24e43a67d9a6e7d2f7d3033a601f +refs/heads/master: 88dd3eb4d8cb335166df779bcaabab9d1c5fa513 diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c b/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c index f2c7ab62a1c5..64fe4b248ee9 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c +++ b/trunk/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) {