Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1411942

[PATCH v2 6/6] alx: Use pci_(request|release)_mem_regions

Show all headers | View raw

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

Suggested-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Cc: Jay Cliburn <jcliburn@gmail.com>
Cc: Chris Snook <chris.snook@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: intel-wired-lan@lists.osuosl.org
---
 drivers/net/ethernet/atheros/alx/main.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index 55b118e..d2363de 100644
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -1238,7 +1238,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)
@@ -1258,11 +1258,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;
 	}
 
@@ -1388,7 +1387,7 @@ out_unmap:
 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;
@@ -1407,8 +1406,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);
-- 
1.8.5.6

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/6] Introduce pci_(request|release)_(mem|io)_regions Johannes Thumshirn <jthumshirn@suse.de> - 2016-06-02 09:40 +0200
  [PATCH v2 2/6] NVMe: Use pci_(request|release)_mem_regions Johannes Thumshirn <jthumshirn@suse.de> - 2016-06-02 09:40 +0200
  [PATCH v2 4/6] GenWQE: Use pci_(request|release)_mem_regions Johannes Thumshirn <jthumshirn@suse.de> - 2016-06-02 09:40 +0200
  [PATCH v2 6/6] alx: Use pci_(request|release)_mem_regions Johannes Thumshirn <jthumshirn@suse.de> - 2016-06-02 09:40 +0200
  [PATCH v2 1/6] PCI: Add helpers to request/release memory and I/O regions Johannes Thumshirn <jthumshirn@suse.de> - 2016-06-02 09:40 +0200
    Re: [PATCH v2 1/6] PCI: Add helpers to request/release memory and  I/O regions kbuild test robot <lkp@intel.com> - 2016-06-05 01:30 +0200
    Re: [PATCH v2 1/6] PCI: Add helpers to request/release memory and  I/O regions kbuild test robot <lkp@intel.com> - 2016-06-05 01:40 +0200
      Re: [PATCH v2 1/6] PCI: Add helpers to request/release memory and  I/O regions Johannes Thumshirn <jthumshirn@suse.de> - 2016-06-06 10:20 +0200
  [PATCH v2 5/6] ethernet/intel: Use pci_(request|release)_mem_regions Johannes Thumshirn <jthumshirn@suse.de> - 2016-06-02 09:40 +0200
    Re: [PATCH v2 5/6] ethernet/intel: Use  pci_(request|release)_mem_regions Jeff Kirsher <jeffrey.t.kirsher@intel.com> - 2016-06-02 23:10 +0200
  [PATCH v2 3/6] lpfc: Use pci_(request|release)_mem_regions Johannes Thumshirn <jthumshirn@suse.de> - 2016-06-02 09:40 +0200
    Re: [PATCH v2 3/6] lpfc: Use pci_(request|release)_mem_regions Johannes Thumshirn <jthumshirn@suse.de> - 2016-06-06 10:20 +0200

csiph-web