|
@@ -1284,7 +1284,7 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
struct alx_priv *alx;
|
|
struct alx_priv *alx;
|
|
struct alx_hw *hw;
|
|
struct alx_hw *hw;
|
|
bool phy_configured;
|
|
bool phy_configured;
|
|
- int bars, err;
|
|
|
|
|
|
+ int err;
|
|
|
|
|
|
err = pci_enable_device_mem(pdev);
|
|
err = pci_enable_device_mem(pdev);
|
|
if (err)
|
|
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) {
|
|
if (err) {
|
|
dev_err(&pdev->dev,
|
|
dev_err(&pdev->dev,
|
|
- "pci_request_selected_regions failed(bars:%d)\n", bars);
|
|
|
|
|
|
+ "pci_request_mem_regions failed\n");
|
|
goto out_pci_disable;
|
|
goto out_pci_disable;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1434,7 +1433,7 @@ out_unmap:
|
|
out_free_netdev:
|
|
out_free_netdev:
|
|
free_netdev(netdev);
|
|
free_netdev(netdev);
|
|
out_pci_release:
|
|
out_pci_release:
|
|
- pci_release_selected_regions(pdev, bars);
|
|
|
|
|
|
+ pci_release_mem_regions(pdev);
|
|
out_pci_disable:
|
|
out_pci_disable:
|
|
pci_disable_device(pdev);
|
|
pci_disable_device(pdev);
|
|
return err;
|
|
return err;
|
|
@@ -1453,8 +1452,7 @@ static void alx_remove(struct pci_dev *pdev)
|
|
|
|
|
|
unregister_netdev(alx->dev);
|
|
unregister_netdev(alx->dev);
|
|
iounmap(hw->hw_addr);
|
|
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_pcie_error_reporting(pdev);
|
|
pci_disable_device(pdev);
|
|
pci_disable_device(pdev);
|