diff options
| author | Daeseok Youn <daeseok.youn@gmail.com> | 2014-10-08 20:12:48 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-20 10:29:26 +0800 |
| commit | 9f2b744475b141a2d8e1bf047ecd06a054f300e3 (patch) | |
| tree | e358983f803da0cbe04598d2bd4b116d24f8a44d /drivers/staging/dgap | |
| parent | 748d9dd1b1b6cd88a0dbc0b3dd49fb51dcb1c9de (diff) | |
staging: dgap: remove unnecessary if statement for checking NULL
dgap_release_remap() function is only called after the memory
has been remapped so if statement for checking NULL doesn't
need.
And also release_mem_region() calls are moved after iounmap() calls.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/dgap')
| -rw-r--r-- | drivers/staging/dgap/dgap.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index 2f2aa59600e5..38077878f61a 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -1013,15 +1013,10 @@ static int dgap_do_remap(struct board_t *brd) static void dgap_release_remap(struct board_t *brd) { - if (brd->re_map_membase) { - release_mem_region(brd->membase, 0x200000); - iounmap(brd->re_map_membase); - } - - if (brd->re_map_port) { - release_mem_region(brd->membase + PCI_IO_OFFSET, 0x200000); - iounmap(brd->re_map_port); - } + iounmap(brd->re_map_port); + iounmap(brd->re_map_membase); + release_mem_region(brd->membase + PCI_IO_OFFSET, 0x200000); + release_mem_region(brd->membase, 0x200000); } /***************************************************************************** * |