Commit b3ca977f authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 109daa79
...@@ -215,8 +215,6 @@ static const struct me4000_board me4000_boards[] = { ...@@ -215,8 +215,6 @@ static const struct me4000_board me4000_boards[] = {
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
Meilhaus function prototypes 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 xilinx_download(struct comedi_device *dev);
static int reset_board(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) ...@@ -310,9 +308,7 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it)
if (!info->program_regbase) if (!info->program_regbase)
return -ENODEV; return -ENODEV;
result = init_board_info(dev, pci_device); dev->irq = pci_device->irq;
if (result)
return result;
result = xilinx_download(dev); result = xilinx_download(dev);
if (result) if (result)
...@@ -325,18 +321,6 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -325,18 +321,6 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it)
return 0; 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 #define FIRMWARE_NOT_AVAILABLE 1
#if FIRMWARE_NOT_AVAILABLE #if FIRMWARE_NOT_AVAILABLE
extern unsigned char *xilinx_firm; extern unsigned char *xilinx_firm;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment