From 0ecb693621979f60f7a2b141c1d76cc7c2db30c5 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 7 Sep 2012 17:45:42 -0700
Subject: [PATCH] --- yaml --- r: 324963 b: refs/heads/master c:
 b3ca977f083db063c9e53db04d8b12373ded8867 h: refs/heads/master i:   324961:
 7c7a3fb4ef0ae784fcf89eb0654d8a5ce3807c46   324959:
 a9d0ad531b3c985d05dec8a02093de9f1372e5b0 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/comedi/drivers/me4000.c | 18 +-----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 10a8c374eedf..ff3de4e9fb7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 109daa79807a47dc56d7533a7fdcd0dc72c862b2
+refs/heads/master: b3ca977f083db063c9e53db04d8b12373ded8867
diff --git a/trunk/drivers/staging/comedi/drivers/me4000.c b/trunk/drivers/staging/comedi/drivers/me4000.c
index a041054c953c..f76f8da9a402 100644
--- a/trunk/drivers/staging/comedi/drivers/me4000.c
+++ b/trunk/drivers/staging/comedi/drivers/me4000.c
@@ -215,8 +215,6 @@ static const struct me4000_board me4000_boards[] = {
 /*-----------------------------------------------------------------------------
   Meilhaus function prototypes
   ---------------------------------------------------------------------------*/
-static int init_board_info(struct comedi_device *dev,
-			   struct pci_dev *pci_dev_p);
 static int xilinx_download(struct comedi_device *dev);
 static int reset_board(struct comedi_device *dev);
 
@@ -310,9 +308,7 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it)
 	if (!info->program_regbase)
 		return -ENODEV;
 
-	result = init_board_info(dev, pci_device);
-	if (result)
-		return result;
+	dev->irq = pci_device->irq;
 
 	result = xilinx_download(dev);
 	if (result)
@@ -325,18 +321,6 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it)
 	return 0;
 }
 
-static int init_board_info(struct comedi_device *dev, struct pci_dev *pci_dev_p)
-{
-	/* Init spin locks */
-	/* spin_lock_init(&info->preload_lock); */
-	/* spin_lock_init(&info->ai_ctrl_lock); */
-
-	/* Get the irq assigned to the board */
-	dev->irq = pci_dev_p->irq;
-
-	return 0;
-}
-
 #define FIRMWARE_NOT_AVAILABLE 1
 #if FIRMWARE_NOT_AVAILABLE
 extern unsigned char *xilinx_firm;