Commit 8148f37b authored by Daeseok Youn's avatar Daeseok Youn Committed by Greg Kroah-Hartman

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

Pass "brd" to dgap_after_config_loaded() instead of passing
"dgap_numboards" and looking up brd again.
Signed-off-by: default avatarDaeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent efd96189
......@@ -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;
}
......
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