staging: dgap: move function before remove
move the cleanup function before the remove call as the next patch of the series is going to use that. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
76c807210a
commit
d1c9f3efc4
1 changed files with 30 additions and 31 deletions
|
@ -6987,6 +6987,36 @@ cleanup_brd:
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* dgap_cleanup_board()
|
||||||
|
*
|
||||||
|
* Free all the memory associated with a board
|
||||||
|
*/
|
||||||
|
static void dgap_cleanup_board(struct board_t *brd)
|
||||||
|
{
|
||||||
|
unsigned int i;
|
||||||
|
|
||||||
|
if (!brd || brd->magic != DGAP_BOARD_MAGIC)
|
||||||
|
return;
|
||||||
|
|
||||||
|
dgap_free_irq(brd);
|
||||||
|
|
||||||
|
tasklet_kill(&brd->helper_tasklet);
|
||||||
|
|
||||||
|
dgap_unmap(brd);
|
||||||
|
|
||||||
|
/* Free all allocated channels structs */
|
||||||
|
for (i = 0; i < MAXPORTS ; i++)
|
||||||
|
kfree(brd->channels[i]);
|
||||||
|
|
||||||
|
kfree(brd->flipbuf);
|
||||||
|
kfree(brd->flipflagbuf);
|
||||||
|
|
||||||
|
dgap_board[brd->boardnum] = NULL;
|
||||||
|
|
||||||
|
kfree(brd);
|
||||||
|
}
|
||||||
|
|
||||||
static void dgap_remove_one(struct pci_dev *dev)
|
static void dgap_remove_one(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
/* Do Nothing */
|
/* Do Nothing */
|
||||||
|
@ -7071,37 +7101,6 @@ static void dgap_stop(void)
|
||||||
unregister_chrdev(DIGI_DGAP_MAJOR, "dgap");
|
unregister_chrdev(DIGI_DGAP_MAJOR, "dgap");
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* dgap_cleanup_board()
|
|
||||||
*
|
|
||||||
* Free all the memory associated with a board
|
|
||||||
*/
|
|
||||||
static void dgap_cleanup_board(struct board_t *brd)
|
|
||||||
{
|
|
||||||
unsigned int i;
|
|
||||||
|
|
||||||
if (!brd || brd->magic != DGAP_BOARD_MAGIC)
|
|
||||||
return;
|
|
||||||
|
|
||||||
dgap_free_irq(brd);
|
|
||||||
|
|
||||||
tasklet_kill(&brd->helper_tasklet);
|
|
||||||
|
|
||||||
dgap_unmap(brd);
|
|
||||||
|
|
||||||
/* Free all allocated channels structs */
|
|
||||||
for (i = 0; i < MAXPORTS ; i++)
|
|
||||||
kfree(brd->channels[i]);
|
|
||||||
|
|
||||||
kfree(brd->flipbuf);
|
|
||||||
kfree(brd->flipflagbuf);
|
|
||||||
|
|
||||||
dgap_board[brd->boardnum] = NULL;
|
|
||||||
|
|
||||||
kfree(brd);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/************************************************************************
|
/************************************************************************
|
||||||
*
|
*
|
||||||
* Driver load/unload functions
|
* Driver load/unload functions
|
||||||
|
|
Loading…
Add table
Reference in a new issue