A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 00:00:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
H Hartley Sweeten 2012-09-07 17:45:42 -07:00 • committed by Greg Kroah-Hartman
commit b3ca977f08
1 changed files with 1 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
drivers/staging/comedi/drivers/me4000.c
View file

@ -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;