浏览代码

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>
Daeseok Youn 11 年之前
父节点
当前提交
9f2b744475
共有 1 个文件被更改,包括 4 次插入9 次删除
  1. 4 9
      drivers/staging/dgap/dgap.c

+ 4 - 9
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)
 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);
 }
 }
 /*****************************************************************************
 /*****************************************************************************
 *
 *