projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pci-v4.8-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
[deliverable/linux.git]
/
drivers
/
net
/
ethernet
/
intel
/
ixgbe
/
ixgbe_main.c
diff --git
a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 7871f538f0ad0ea67e4d1564d19552706e5a501b..5418c69a74630bdd8b2aa2519c9e7f41c3e76ac9 100644
(file)
--- a/
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@
-9353,8
+9353,7
@@
static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
pci_using_dac = 0;
}
pci_using_dac = 0;
}
- err = pci_request_selected_regions(pdev, pci_select_bars(pdev,
- IORESOURCE_MEM), ixgbe_driver_name);
+ err = pci_request_mem_regions(pdev, ixgbe_driver_name);
if (err) {
dev_err(&pdev->dev,
"pci_request_selected_regions failed 0x%x\n", err);
if (err) {
dev_err(&pdev->dev,
"pci_request_selected_regions failed 0x%x\n", err);
@@
-9740,8
+9739,7
@@
err_ioremap:
disable_dev = !test_and_set_bit(__IXGBE_DISABLED, &adapter->state);
free_netdev(netdev);
err_alloc_etherdev:
disable_dev = !test_and_set_bit(__IXGBE_DISABLED, &adapter->state);
free_netdev(netdev);
err_alloc_etherdev:
- pci_release_selected_regions(pdev,
- pci_select_bars(pdev, IORESOURCE_MEM));
+ pci_release_mem_regions(pdev);
err_pci_reg:
err_dma:
if (!adapter || disable_dev)
err_pci_reg:
err_dma:
if (!adapter || disable_dev)
@@
-9808,8
+9806,7
@@
static void ixgbe_remove(struct pci_dev *pdev)
#endif
iounmap(adapter->io_addr);
#endif
iounmap(adapter->io_addr);
- pci_release_selected_regions(pdev, pci_select_bars(pdev,
- IORESOURCE_MEM));
+ pci_release_mem_regions(pdev);
e_dev_info("complete\n");
e_dev_info("complete\n");
This page took
0.03128 seconds
and
5
git commands to generate.