diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2023-06-26 13:00:00 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2023-06-26 13:00:00 -0500 |
| commit | 6ecac465eee887de7ceda7ffe3bccf538eb786bc (patch) | |
| tree | 89489094d1aa550086422a17dc22583841403617 /drivers/pci/controller/pcie-altera-msi.c | |
| parent | d8c226ac1f748d0eac54ef869a4f41b26bc4f825 (diff) | |
| parent | afbb9130d2bf04888e91bddc4127d7121b9aee3d (diff) | |
| download | linux-6ecac465eee887de7ceda7ffe3bccf538eb786bc.tar.gz linux-6ecac465eee887de7ceda7ffe3bccf538eb786bc.tar.bz2 linux-6ecac465eee887de7ceda7ffe3bccf538eb786bc.zip | |
Merge branch 'pci/controller/remove-void-callbacks'
- Convert platform_device .remove() callbacks to return void instead of a
mostly useless int (Uwe Kleine-König)
* pci/controller/remove-void-callbacks:
PCI: xgene-msi: Convert to platform remove callback returning void
PCI: tegra: Convert to platform remove callback returning void
PCI: rockchip-host: Convert to platform remove callback returning void
PCI: mvebu: Convert to platform remove callback returning void
PCI: mt7621: Convert to platform remove callback returning void
PCI: mediatek-gen3: Convert to platform remove callback returning void
PCI: mediatek: Convert to platform remove callback returning void
PCI: iproc: Convert to platform remove callback returning void
PCI: hisi-error: Convert to platform remove callback returning void
PCI: dwc: Convert to platform remove callback returning void
PCI: j721e: Convert to platform remove callback returning void
PCI: brcmstb: Convert to platform remove callback returning void
PCI: altera-msi: Convert to platform remove callback returning void
PCI: altera: Convert to platform remove callback returning void
PCI: aardvark: Convert to platform remove callback returning void
Diffstat (limited to 'drivers/pci/controller/pcie-altera-msi.c')
| -rw-r--r-- | drivers/pci/controller/pcie-altera-msi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/controller/pcie-altera-msi.c b/drivers/pci/controller/pcie-altera-msi.c index 65e8a20cc442..6ad5427490b5 100644 --- a/drivers/pci/controller/pcie-altera-msi.c +++ b/drivers/pci/controller/pcie-altera-msi.c @@ -197,7 +197,7 @@ static void altera_free_domains(struct altera_msi *msi) irq_domain_remove(msi->inner_domain); } -static int altera_msi_remove(struct platform_device *pdev) +static void altera_msi_remove(struct platform_device *pdev) { struct altera_msi *msi = platform_get_drvdata(pdev); @@ -207,7 +207,6 @@ static int altera_msi_remove(struct platform_device *pdev) altera_free_domains(msi); platform_set_drvdata(pdev, NULL); - return 0; } static int altera_msi_probe(struct platform_device *pdev) @@ -275,7 +274,7 @@ static struct platform_driver altera_msi_driver = { .of_match_table = altera_msi_of_match, }, .probe = altera_msi_probe, - .remove = altera_msi_remove, + .remove_new = altera_msi_remove, }; static int __init altera_msi_init(void) |