redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: dgap: pass "brd" as a paramter to dgap_after_config_loaded()

Browse source 
Pass "brd" to dgap_after_config_loaded() instead of passing
"dgap_numboards" and looking up brd again.

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Daeseok Youn 2014-06-03 17:01:31 +09:00 committed by Greg Kroah-Hartman
parent efd9618939
commit 8148f37b33
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/staging/dgap/dgap.c
View file

@ -187,7 +187,7 @@ static void dgap_do_fep_load(struct board_t *brd, const u8 *ufep, int len);
#ifdef DIGI_CONCENTRATORS_SUPPORTED
static void dgap_do_conc_load(struct board_t *brd, u8 *uaddr, int len);
#endif
static int dgap_after_config_loaded(int board);
static int dgap_after_config_loaded(struct board_t *brd);
static int dgap_finalize_board_init(struct board_t *brd);
static void dgap_get_vpd(struct board_t *brd);
@ -859,7 +859,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type)
kfree(dgap_config_buf);
}
ret = dgap_after_config_loaded(brd->boardnum);
ret = dgap_after_config_loaded(brd);
if (ret)
return ret;
/*
@ -4113,23 +4113,23 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
}
}
static int dgap_after_config_loaded(int board)
static int dgap_after_config_loaded(struct board_t *brd)
{
/*
* Initialize KME waitqueues...
*/
init_waitqueue_head(&(dgap_board[board]->kme_wait));
init_waitqueue_head(&brd->kme_wait);
/*
* allocate flip buffer for board.
*/
dgap_board[board]->flipbuf = kmalloc(MYFLIPLEN, GFP_KERNEL);
if (!dgap_board[board]->flipbuf)
brd->flipbuf = kmalloc(MYFLIPLEN, GFP_KERNEL);
if (!brd->flipbuf)
return -ENOMEM;
dgap_board[board]->flipflagbuf = kmalloc(MYFLIPLEN, GFP_KERNEL);
if (!dgap_board[board]->flipflagbuf) {
kfree(dgap_board[board]->flipbuf);
brd->flipflagbuf = kmalloc(MYFLIPLEN, GFP_KERNEL);
if (!brd->flipflagbuf) {
kfree(brd->flipbuf);
return -ENOMEM;
}