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@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/comedi/drivers/me4000.c | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index a041054..f76f8da 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;
--
1.7.11
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
