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

Commit caa8e932 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Bjorn Helgaas
Browse files

alx: Use pci_(request|release)_mem_regions 



Now that we do have pci_request_mem_regions() and pci_release_mem_regions()
at hand, use it in the ethernet drivers.

Suggested-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
CC: Jay Cliburn <jcliburn@gmail.com>
CC: Chris Snook <chris.snook@gmail.com>
CC: David S. Miller <davem@davemloft.net>
parent 56d766d6

drivers/net/ethernet/atheros/alx/main.c

+5 −7
Original line number Diff line number Diff line
@@ -1284,7 +1284,7 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct alx_priv *alx;

	struct alx_hw *hw;

	bool phy_configured;

	int bars, err;

	int err;



	err = pci_enable_device_mem(pdev);

	if (err)
@@ -1304,11 +1304,10 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		}

	}



	bars = pci_select_bars(pdev, IORESOURCE_MEM);

	err = pci_request_selected_regions(pdev, bars, alx_drv_name);

	err = pci_request_mem_regions(pdev, alx_drv_name);

	if (err) {

		dev_err(&pdev->dev,

			"pci_request_selected_regions failed(bars:%d)\n", bars);

			"pci_request_mem_regions failed\n");

		goto out_pci_disable;

	}
@@ -1434,7 +1433,7 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
out_free_netdev:

	free_netdev(netdev);

out_pci_release:

	pci_release_selected_regions(pdev, bars);

	pci_release_mem_regions(pdev);

out_pci_disable:

	pci_disable_device(pdev);

	return err;
@@ -1453,8 +1452,7 @@ static void alx_remove(struct pci_dev *pdev) 


	unregister_netdev(alx->dev);

	iounmap(hw->hw_addr);

	pci_release_selected_regions(pdev,

				     pci_select_bars(pdev, IORESOURCE_MEM));

	pci_release_mem_regions(pdev);



	pci_disable_pcie_error_reporting(pdev);

	pci_disable_device(pdev);