From 6bd2b170740df4dedf9eb2c551d47968da4f00eb Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Mon, 2 Jul 2012 15:45:34 -0700
Subject: [PATCH] --- yaml --- r: 317695 b: refs/heads/master c:
 fb795746195bb8566ecfb50dec9f63676fc29575 h: refs/heads/master i:   317693:
 4ae596af6302f224e676e8573383f0d8e5ba340e   317691:
 8a9e6050d0bae3483e698276e80149086c037c2e   317687:
 76727345d740e33dca83e9038aae8b44c017889c   317679:
 c4bd14a952ba9d54f73939eae143408192bcde08   317663:
 1acb6473dc93490d62e37b304dbb7491d6bafe35   317631:
 5dffb7561feba735820a71a6934ebaf97a003a50   317567:
 f713a5a625308487b79c71e8b9f2d806cec42a7e   317439:
 5248ab893b8ec78754825deef5e9683da0618d92 v: v3

---
 [refs]                                        |  2 +-
 .../drivers/staging/comedi/drivers/das08_cs.c | 87 +++++++++----------
 2 files changed, 40 insertions(+), 49 deletions(-)

diff --git a/[refs] b/[refs]
index a488ec3f3782..35d548465f89 100644
--- 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
index f56fd401568c..43322c3477bc 100644
--- 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)