From mboxrd@z Thu Jan 1 00:00:00 1970 From: Subject: [PATCH V2 net 1/4] net: ena: fix warning in rmmod caused by double iounmap Date: Tue, 9 Oct 2018 11:21:27 +0300 Message-ID: <1539073290-30270-2-git-send-email-akiyano@amazon.com> References: <1539073290-30270-1-git-send-email-akiyano@amazon.com> Mime-Version: 1.0 Content-Type: text/plain Cc: Arthur Kiyanovski , , , , , , , , , , To: , Return-path: Received: from smtp-fw-6002.amazon.com ([52.95.49.90]:7338 "EHLO smtp-fw-6002.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725866AbeJIPh0 (ORCPT ); Tue, 9 Oct 2018 11:37:26 -0400 In-Reply-To: <1539073290-30270-1-git-send-email-akiyano@amazon.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Arthur Kiyanovski Memory mapped with devm_ioremap is automatically freed when the driver is disconnected from the device. Therefore there is no need to explicitly call devm_iounmap. Fixes: 0857d92f71b6 ("net: ena: add missing unmap bars on device removal") Fixes: 411838e7b41c ("net: ena: fix rare kernel crash when bar memory remap fails") Signed-off-by: Arthur Kiyanovski --- drivers/net/ethernet/amazon/ena/ena_netdev.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c index 25621a2..78d84ca 100644 --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c @@ -3099,15 +3099,8 @@ static int ena_rss_init_default(struct ena_adapter *adapter) static void ena_release_bars(struct ena_com_dev *ena_dev, struct pci_dev *pdev) { - int release_bars; + int release_bars = pci_select_bars(pdev, IORESOURCE_MEM) & ENA_BAR_MASK; - if (ena_dev->mem_bar) - devm_iounmap(&pdev->dev, ena_dev->mem_bar); - - if (ena_dev->reg_bar) - devm_iounmap(&pdev->dev, ena_dev->reg_bar); - - release_bars = pci_select_bars(pdev, IORESOURCE_MEM) & ENA_BAR_MASK; pci_release_selected_regions(pdev, release_bars); } -- 2.7.4