---

yaml --- r: 354248 b: refs/heads/master c: 616b7a4 h: refs/heads/master v: v3
git-mirror · Jan 30, 2013 · f48e614 · f48e614
1 parent 28b251c
commit f48e614
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abbe0796baa03610f3147c786c7c3f20b0050c1d
+refs/heads/master: 616b7a479e190e099f75073231c027fa393da5b2
diff --git a/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c b/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c
@@ -227,10 +227,23 @@ static uint16_t mio_cs_win_in(struct comedi_device *dev, int addr)
 
 #include "ni_mio_common.c"
 
+static struct pcmcia_device *cur_dev;
+
 static int ni_getboardtype(struct comedi_device *dev,
-			   struct pcmcia_device *link);
+			   struct pcmcia_device *link)
+{
+	int i;
 
-static struct pcmcia_device *cur_dev;
+	for (i = 0; i < n_ni_boards; i++) {
+		if (ni_boards[i].device_id == link->card_id)
+			return i;
+	}
+
+	dev_err(dev->class_dev,
+		"unknown board 0x%04x -- pretend it is a ", link->card_id);
+
+	return 0;
+}
 
 static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
@@ -301,22 +314,6 @@ static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	return 0;
 }
 
-static int ni_getboardtype(struct comedi_device *dev,
-			   struct pcmcia_device *link)
-{
-	int i;
-
-	for (i = 0; i < n_ni_boards; i++) {
-		if (ni_boards[i].device_id == link->card_id)
-			return i;
-	}
-
-	dev_err(dev->class_dev,
-		"unknown board 0x%04x -- pretend it is a ", link->card_id);
-
-	return 0;
-}
-
 static void mio_cs_detach(struct comedi_device *dev)
 {
 	mio_common_detach(dev);