---

yaml --- r: 317695 b: refs/heads/master c: fb79574 h: refs/heads/master i: 317693: 4ae596a 317691: 8a9e605 317687: 7672734 317679: c4bd14a 317663: 1acb647 317631: 5dffb75 317567: f713a5a 317439: 5248ab8 v: v3
git-mirror · Jul 6, 2012 · 6bd2b17 · 6bd2b17
1 parent d33064d
commit 6bd2b17
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 49 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c332d969e4874c00bcf3d37fc69157558e1ca04b
+refs/heads/master: fb795746195bb8566ecfb50dec9f63676fc29575
diff --git a/trunk/drivers/staging/comedi/drivers/das08_cs.c b/trunk/drivers/staging/comedi/drivers/das08_cs.c
@@ -104,54 +104,12 @@ static int das08_cs_attach(struct comedi_device *dev,
 	return das08_common_attach(dev, iobase);
 }
 
-static void das08_pcmcia_config(struct pcmcia_device *link);
-static void das08_pcmcia_release(struct pcmcia_device *link);
-static int das08_pcmcia_suspend(struct pcmcia_device *p_dev);
-static int das08_pcmcia_resume(struct pcmcia_device *p_dev);
-
-static int das08_pcmcia_attach(struct pcmcia_device *);
-static void das08_pcmcia_detach(struct pcmcia_device *);
-
-struct local_info_t {
-	struct pcmcia_device *link;
-	int stop;
-	struct bus_operations *bus;
-};
-
-static int das08_pcmcia_attach(struct pcmcia_device *link)
-{
-	struct local_info_t *local;
-
-	dev_dbg(&link->dev, "das08_pcmcia_attach()\n");
-
-	/* Allocate space for private device-specific data */
-	local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL);
-	if (!local)
-		return -ENOMEM;
-	local->link = link;
-	link->priv = local;
-
-	cur_dev = link;
-
-	das08_pcmcia_config(link);
-
-	return 0;
-}
-
-static void das08_pcmcia_detach(struct pcmcia_device *link)
+static void das08_pcmcia_release(struct pcmcia_device *link)
 {
-
-	dev_dbg(&link->dev, "das08_pcmcia_detach\n");
-
-	((struct local_info_t *)link->priv)->stop = 1;
-	das08_pcmcia_release(link);
-
-	/* This points to the parent struct local_info_t struct */
-	kfree(link->priv);
-
+	dev_dbg(&link->dev, "das08_pcmcia_release\n");
+	pcmcia_disable_device(link);
 }
 
-
 static int das08_pcmcia_config_loop(struct pcmcia_device *p_dev,
 				void *priv_data)
 {
@@ -189,10 +147,43 @@ static void das08_pcmcia_config(struct pcmcia_device *link)
 
 }
 
-static void das08_pcmcia_release(struct pcmcia_device *link)
+struct local_info_t {
+	struct pcmcia_device *link;
+	int stop;
+	struct bus_operations *bus;
+};
+
+static int das08_pcmcia_attach(struct pcmcia_device *link)
 {
-	dev_dbg(&link->dev, "das08_pcmcia_release\n");
-	pcmcia_disable_device(link);
+	struct local_info_t *local;
+
+	dev_dbg(&link->dev, "das08_pcmcia_attach()\n");
+
+	/* Allocate space for private device-specific data */
+	local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL);
+	if (!local)
+		return -ENOMEM;
+	local->link = link;
+	link->priv = local;
+
+	cur_dev = link;
+
+	das08_pcmcia_config(link);
+
+	return 0;
+}
+
+static void das08_pcmcia_detach(struct pcmcia_device *link)
+{
+
+	dev_dbg(&link->dev, "das08_pcmcia_detach\n");
+
+	((struct local_info_t *)link->priv)->stop = 1;
+	das08_pcmcia_release(link);
+
+	/* This points to the parent struct local_info_t struct */
+	kfree(link->priv);
+
 }
 
 static int das08_pcmcia_suspend(struct pcmcia_device *link)