Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: mdio: thunder: 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.

Furthermore, the PCI function being managed implies that it's not
necessary to call pci_release_regions() manually.

Remove the calls to pci_release_regions().

Replace pci_request_regions() with pcim_request_all_regions().

Signed-off-by: Philipp Stanner <phasta@kernel.org>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/20250425085740.65304-8-phasta@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Philipp Stanner and committed by
Jakub Kicinski
fad4d94d 6e5f7a5b

+3 -7
+3 -7
drivers/net/mdio/mdio-thunder.c
··· 40 40 return err; 41 41 } 42 42 43 - err = pci_request_regions(pdev, KBUILD_MODNAME); 43 + err = pcim_request_all_regions(pdev, KBUILD_MODNAME); 44 44 if (err) { 45 - dev_err(&pdev->dev, "pci_request_regions failed\n"); 45 + dev_err(&pdev->dev, "pcim_request_all_regions failed\n"); 46 46 goto err_disable_device; 47 47 } 48 48 49 49 nexus->bar0 = pcim_iomap(pdev, 0, pci_resource_len(pdev, 0)); 50 50 if (!nexus->bar0) { 51 51 err = -ENOMEM; 52 - goto err_release_regions; 52 + goto err_disable_device; 53 53 } 54 54 55 55 i = 0; ··· 107 107 } 108 108 return 0; 109 109 110 - err_release_regions: 111 - pci_release_regions(pdev); 112 - 113 110 err_disable_device: 114 111 pci_set_drvdata(pdev, NULL); 115 112 return err; ··· 126 129 mdiobus_unregister(bus->mii_bus); 127 130 oct_mdio_writeq(0, bus->register_base + SMI_EN); 128 131 } 129 - pci_release_regions(pdev); 130 132 pci_set_drvdata(pdev, NULL); 131 133 } 132 134