Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0857d92f authored by Netanel Belgazal's avatar Netanel Belgazal Committed by David S. Miller
Browse files

net: ena: add missing unmap bars on device removal 



This patch also change the mapping functions to devm_ functions

Fixes: 1738cd3e ("Add a driver for Amazon Elastic Network Adapters (ENA)")
Signed-off-by: default avatarNetanel Belgazal <netanel@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 661d2b0c

drivers/net/ethernet/amazon/ena/ena_netdev.c

+11 −4
Original line number Diff line number Diff line
@@ -2853,6 +2853,11 @@ static void ena_release_bars(struct ena_com_dev *ena_dev, struct pci_dev *pdev) 
{

	int release_bars;



	if (ena_dev->mem_bar)

		devm_iounmap(&pdev->dev, ena_dev->mem_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);

}
@@ -2940,7 +2945,8 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_free_ena_dev;

	}



	ena_dev->reg_bar = ioremap(pci_resource_start(pdev, ENA_REG_BAR),

	ena_dev->reg_bar = devm_ioremap(&pdev->dev,

					pci_resource_start(pdev, ENA_REG_BAR),

					pci_resource_len(pdev, ENA_REG_BAR));

	if (!ena_dev->reg_bar) {

		dev_err(&pdev->dev, "failed to remap regs bar\n");
@@ -2961,7 +2967,8 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	ena_set_push_mode(pdev, ena_dev, &get_feat_ctx);



	if (ena_dev->tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) {

		ena_dev->mem_bar = ioremap_wc(pci_resource_start(pdev, ENA_MEM_BAR),

		ena_dev->mem_bar = devm_ioremap_wc(&pdev->dev,

						   pci_resource_start(pdev, ENA_MEM_BAR),

						   pci_resource_len(pdev, ENA_MEM_BAR));

		if (!ena_dev->mem_bar) {

			rc = -EFAULT;