---

yaml --- r: 354253 b: refs/heads/master c: 88dd3eb h: refs/heads/master i: 354251: 4212127 v: v3
git-mirror · Jan 30, 2013 · 125519b · 125519b
1 parent 71ff7e0
commit 125519b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git 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
@@ -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)
 {