mirror of
https://github.com/torvalds/linux.git
synced 2026-07-28 18:21:24 +02:00
net: prestera: 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> Acked-by: Elad Nachman <enachman@marvell.com> Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> Link: https://patch.msgid.link/20250425085740.65304-3-phasta@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
034ebd3c82
commit
66ada74711
|
|
@ -845,9 +845,9 @@ static int prestera_pci_probe(struct pci_dev *pdev,
|
|||
goto err_pci_enable_device;
|
||||
}
|
||||
|
||||
err = pci_request_regions(pdev, driver_name);
|
||||
err = pcim_request_all_regions(pdev, driver_name);
|
||||
if (err) {
|
||||
dev_err(&pdev->dev, "pci_request_regions failed\n");
|
||||
dev_err(&pdev->dev, "pcim_request_all_regions failed\n");
|
||||
goto err_pci_request_regions;
|
||||
}
|
||||
|
||||
|
|
@ -938,7 +938,6 @@ static int prestera_pci_probe(struct pci_dev *pdev,
|
|||
err_pp_ioremap:
|
||||
err_mem_ioremap:
|
||||
err_dma_mask:
|
||||
pci_release_regions(pdev);
|
||||
err_pci_request_regions:
|
||||
err_pci_enable_device:
|
||||
return err;
|
||||
|
|
@ -953,7 +952,6 @@ static void prestera_pci_remove(struct pci_dev *pdev)
|
|||
pci_free_irq_vectors(pdev);
|
||||
destroy_workqueue(fw->wq);
|
||||
prestera_fw_uninit(fw);
|
||||
pci_release_regions(pdev);
|
||||
}
|
||||
|
||||
static const struct pci_device_id prestera_pci_devices[] = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user