From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx> Date: Sun, 18 Jan 2015 13:33:25 +0100 The iounmap() function performs also input parameter validation. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx> --- drivers/block/cciss.c | 18 ++++++------------ drivers/block/mg_disk.c | 3 +-- drivers/block/skd_main.c | 6 ++---- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index ff20f19..d13ef0f 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -4382,12 +4382,9 @@ err_out_free_res: * Deliberately omit pci_disable_device(): it does something nasty to * Smart Array controllers that pci_enable_device does not undo */ - if (h->transtable) - iounmap(h->transtable); - if (h->cfgtable) - iounmap(h->cfgtable); - if (h->vaddr) - iounmap(h->vaddr); + iounmap(h->transtable); + iounmap(h->cfgtable); + iounmap(h->vaddr); pci_release_regions(h->pdev); return err; } @@ -4939,12 +4936,9 @@ static void cciss_undo_allocations_after_kdump_soft_reset(ctlr_info_t *h) if (h->reply_pool) pci_free_consistent(h->pdev, h->max_commands * sizeof(__u64), h->reply_pool, h->reply_pool_dhandle); - if (h->transtable) - iounmap(h->transtable); - if (h->cfgtable) - iounmap(h->cfgtable); - if (h->vaddr) - iounmap(h->vaddr); + iounmap(h->transtable); + iounmap(h->cfgtable); + iounmap(h->vaddr); unregister_blkdev(h->major, h->devname); cciss_destroy_hba_sysfs_entry(h); pci_release_regions(h->pdev); diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c index 145ce2a..9f738ee 100644 --- a/drivers/block/mg_disk.c +++ b/drivers/block/mg_disk.c @@ -1068,8 +1068,7 @@ static int mg_remove(struct platform_device *plat_dev) gpio_free(host->rst); /* unmap io */ - if (host->dev_base) - iounmap(host->dev_base); + iounmap(host->dev_base); /* free mg_host */ kfree(host); diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c index 1e46eb2..d4c7c4b 100644 --- a/drivers/block/skd_main.c +++ b/drivers/block/skd_main.c @@ -4944,8 +4944,7 @@ err_out_timer: err_out_iounmap: for (i = 0; i < SKD_MAX_BARS; i++) - if (skdev->mem_map[i]) - iounmap(skdev->mem_map[i]); + iounmap(skdev->mem_map[i]); if (skdev->pcie_error_reporting_is_enabled) pci_disable_pcie_error_reporting(pdev); @@ -5108,8 +5107,7 @@ err_out_timer: err_out_iounmap: for (i = 0; i < SKD_MAX_BARS; i++) - if (skdev->mem_map[i]) - iounmap(skdev->mem_map[i]); + iounmap(skdev->mem_map[i]); if (skdev->pcie_error_reporting_is_enabled) pci_disable_pcie_error_reporting(pdev); -- 2.2.2 -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
