hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: dgap: use dgap_release_remap() in dgap_cleanup_board() 

Just simply use dgap_release_remap() in dgap_cleanup_board() for
releasing map memory.

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-09-23 09:22:36 +09:00 committed by Greg Kroah-Hartman
parent b23e487903
commit c749201247
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/staging/dgap/dgap.c
View File

@ -683,17 +683,7 @@ static void dgap_cleanup_board(struct board_t *brd)
tasklet_kill(&brd->helper_tasklet); tasklet_kill(&brd->helper_tasklet);
if (brd->re_map_port) { dgap_release_remap(brd);
release_mem_region(brd->membase + 0x200000, 0x200000);
iounmap(brd->re_map_port);
brd->re_map_port = NULL;
}
if (brd->re_map_membase) {
release_mem_region(brd->membase, 0x200000);
iounmap(brd->re_map_membase);
brd->re_map_membase = NULL;
}
/* Free all allocated channels structs */ /* Free all allocated channels structs */
for (i = 0; i < MAXPORTS ; i++) for (i = 0; i < MAXPORTS ; i++)
@ -1023,10 +1013,15 @@ static int dgap_do_remap(struct board_t *brd)
static void dgap_release_remap(struct board_t *brd) static void dgap_release_remap(struct board_t *brd)
{ {
release_mem_region(brd->membase, 0x200000); if (brd->re_map_membase) {
release_mem_region(brd->membase + PCI_IO_OFFSET, 0x200000); release_mem_region(brd->membase, 0x200000);
iounmap(brd->re_map_membase); iounmap(brd->re_map_membase);
iounmap(brd->re_map_port); }
if (brd->re_map_port) {
release_mem_region(brd->membase + PCI_IO_OFFSET, 0x200000);
iounmap(brd->re_map_port);
}
} }
/***************************************************************************** /*****************************************************************************
* *