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

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

ethernet/intel: 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 Intel 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>
Acked-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
CC: David S. Miller <davem@davemloft.net>
parent f03774bd

drivers/net/ethernet/intel/e1000e/netdev.c

+2 −4
Original line number Diff line number Diff line
@@ -7321,8 +7321,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
err_ioremap:

	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:

	pci_disable_device(pdev);
@@ -7389,8 +7388,7 @@ static void e1000_remove(struct pci_dev *pdev) 
	if ((adapter->hw.flash_address) &&

	    (adapter->hw.mac.type < e1000_pch_spt))

		iounmap(adapter->hw.flash_address);

	pci_release_selected_regions(pdev,

				     pci_select_bars(pdev, IORESOURCE_MEM));

	pci_release_mem_regions(pdev);



	free_netdev(netdev);

drivers/net/ethernet/intel/fm10k/fm10k_pci.c

+3 −8
Original line number Diff line number Diff line
@@ -1869,10 +1869,7 @@ static int fm10k_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_dma;

	}



	err = pci_request_selected_regions(pdev,

					   pci_select_bars(pdev,

							   IORESOURCE_MEM),

					   fm10k_driver_name);

	err = pci_request_mem_regions(pdev, fm10k_driver_name);

	if (err) {

		dev_err(&pdev->dev,

			"pci_request_selected_regions failed: %d\n", err);
@@ -1976,8 +1973,7 @@ static int fm10k_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
err_ioremap:

	free_netdev(netdev);

err_alloc_netdev:

	pci_release_selected_regions(pdev,

				     pci_select_bars(pdev, IORESOURCE_MEM));

	pci_release_mem_regions(pdev);

err_pci_reg:

err_dma:

	pci_disable_device(pdev);
@@ -2025,8 +2021,7 @@ static void fm10k_remove(struct pci_dev *pdev) 


	free_netdev(netdev);



	pci_release_selected_regions(pdev,

				     pci_select_bars(pdev, IORESOURCE_MEM));

	pci_release_mem_regions(pdev);



	pci_disable_pcie_error_reporting(pdev);

drivers/net/ethernet/intel/i40e/i40e_main.c

+3 −6
Original line number Diff line number Diff line
@@ -10769,8 +10769,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	}



	/* set up pci connections */

	err = pci_request_selected_regions(pdev, pci_select_bars(pdev,

					   IORESOURCE_MEM), i40e_driver_name);

	err = pci_request_mem_regions(pdev, i40e_driver_name);

	if (err) {

		dev_info(&pdev->dev,

			 "pci_request_selected_regions failed %d\n", err);
@@ -11267,8 +11266,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	kfree(pf);

err_pf_alloc:

	pci_disable_pcie_error_reporting(pdev);

	pci_release_selected_regions(pdev,

				     pci_select_bars(pdev, IORESOURCE_MEM));

	pci_release_mem_regions(pdev);

err_pci_reg:

err_dma:

	pci_disable_device(pdev);
@@ -11379,8 +11377,7 @@ static void i40e_remove(struct pci_dev *pdev) 


	iounmap(hw->hw_addr);

	kfree(pf);

	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);

drivers/net/ethernet/intel/igb/igb_main.c

+3 −7
Original line number Diff line number Diff line
@@ -2323,9 +2323,7 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		}

	}



	err = pci_request_selected_regions(pdev, pci_select_bars(pdev,

					   IORESOURCE_MEM),

					   igb_driver_name);

	err = pci_request_mem_regions(pdev, igb_driver_name);

	if (err)

		goto err_pci_reg;
@@ -2749,8 +2747,7 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
err_ioremap:

	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:

	pci_disable_device(pdev);
@@ -2915,8 +2912,7 @@ static void igb_remove(struct pci_dev *pdev) 
	pci_iounmap(pdev, adapter->io_addr);

	if (hw->flash_address)

		iounmap(hw->flash_address);

	pci_release_selected_regions(pdev,

				     pci_select_bars(pdev, IORESOURCE_MEM));

	pci_release_mem_regions(pdev);



	kfree(adapter->shadow_vfta);

	free_netdev(netdev);

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+3 −6
Original line number Diff line number Diff line
@@ -9331,8 +9331,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		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);
@@ -9718,8 +9717,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	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)
@@ -9786,8 +9784,7 @@ static void ixgbe_remove(struct pci_dev *pdev) 


#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");