From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Sat, 8 Sep 2012 00:45:42 +0000 (-0700)
Subject: staging: comedi: me4000: absorb init_board_info() into its caller
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b3ca977f083db063c9e53db04d8b12373ded8867;p=deliverable%2Flinux.git

staging: comedi: me4000: absorb init_board_info() into its caller

The init_board_info() function only gets the irq number from the
pci_dev. Just move the code into the function that calls it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index a041054c953c..f76f8da9a402 100644
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/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 @@ found:
 	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 @@ found:
 	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;