Commit adc36d09 authored by Philipp Stanner's avatar Philipp Stanner Committed by Jakub Kicinski
Browse files

net: tulip: Use pure PCI devres API 



The currently used function pci_request_regions() is one of the
problematic "hybrid devres" PCI functions, which are sometimes managed
through devres, and sometimes not (depending on whether
pci_enable_device() or pcim_enable_device() has been called before).

The PCI subsystem wants to remove this behavior and, therefore, needs to
port all users to functions that don't have this problem.

Replace pci_request_regions() with pcim_request_all_regions().

Signed-off-by: default avatarPhilipp Stanner <phasta@kernel.org>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/20250425085740.65304-5-phasta@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 48217b83

drivers/net/ethernet/dec/tulip/tulip_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1411,7 +1411,7 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


	/* grab all resources from both PIO and MMIO regions, as we

	 * don't want anyone else messing around with our hardware */

	if (pci_request_regions(pdev, DRV_NAME))

	if (pcim_request_all_regions(pdev, DRV_NAME))

		return -ENODEV;



	ioaddr = pcim_iomap(pdev, TULIP_BAR, tulip_tbl[chip_idx].io_size);

drivers/net/ethernet/dec/tulip/winbond-840.c

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent) 
		return -ENOMEM;

	SET_NETDEV_DEV(dev, &pdev->dev);



	if (pci_request_regions(pdev, DRV_NAME))

	if (pcim_request_all_regions(pdev, DRV_NAME))

		goto err_out_netdev;



	ioaddr = pci_iomap(pdev, TULIP_BAR, netdev_res_size);