Skip to content

Commit 6ecac46

Browse files
bjorn-helgaasbjorn-helgaas
committed
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
2 parents d8c226a + afbb913 commit 6ecac46

21 files changed

+43
-80
lines changed

‎drivers/pci/controller/cadence/pci-j721e.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ static int j721e_pcie_probe(struct platform_device *pdev)
542542
return ret;
543543
}
544544

545-
static int j721e_pcie_remove(struct platform_device *pdev)
545+
static void j721e_pcie_remove(struct platform_device *pdev)
546546
{
547547
struct j721e_pcie *pcie = platform_get_drvdata(pdev);
548548
struct cdns_pcie *cdns_pcie = pcie->cdns_pcie;
@@ -552,13 +552,11 @@ static int j721e_pcie_remove(struct platform_device *pdev)
552552
cdns_pcie_disable_phy(cdns_pcie);
553553
pm_runtime_put(dev);
554554
pm_runtime_disable(dev);
555-
556-
return 0;
557555
}
558556

559557
static struct platform_driver j721e_pcie_driver = {
560558
.probe = j721e_pcie_probe,
561-
.remove = j721e_pcie_remove,
559+
.remove_new = j721e_pcie_remove,
562560
.driver = {
563561
.name = "j721e-pcie",
564562
.of_match_table = of_j721e_pcie_match,

‎drivers/pci/controller/dwc/pcie-bt1.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -617,13 +617,11 @@ static int bt1_pcie_probe(struct platform_device *pdev)
617617
return bt1_pcie_add_port(btpci);
618618
}
619619

620-
static int bt1_pcie_remove(struct platform_device *pdev)
620+
static void bt1_pcie_remove(struct platform_device *pdev)
621621
{
622622
struct bt1_pcie *btpci = platform_get_drvdata(pdev);
623623

624624
bt1_pcie_del_port(btpci);
625-
626-
return 0;
627625
}
628626

629627
static const struct of_device_id bt1_pcie_of_match[] = {
@@ -634,7 +632,7 @@ MODULE_DEVICE_TABLE(of, bt1_pcie_of_match);
634632

635633
static struct platform_driver bt1_pcie_driver = {
636634
.probe = bt1_pcie_probe,
637-
.remove = bt1_pcie_remove,
635+
.remove_new = bt1_pcie_remove,
638636
.driver = {
639637
.name = "bt1-pcie",
640638
.of_match_table = bt1_pcie_of_match,

‎drivers/pci/controller/dwc/pcie-histb.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -421,16 +421,14 @@ static int histb_pcie_probe(struct platform_device *pdev)
421421
return 0;
422422
}
423423

424-
static int histb_pcie_remove(struct platform_device *pdev)
424+
static void histb_pcie_remove(struct platform_device *pdev)
425425
{
426426
struct histb_pcie *hipcie = platform_get_drvdata(pdev);
427427

428428
histb_pcie_host_disable(hipcie);
429429

430430
if (hipcie->phy)
431431
phy_exit(hipcie->phy);
432-
433-
return 0;
434432
}
435433

436434
static const struct of_device_id histb_pcie_of_match[] = {
@@ -441,7 +439,7 @@ MODULE_DEVICE_TABLE(of, histb_pcie_of_match);
441439

442440
static struct platform_driver histb_pcie_platform_driver = {
443441
.probe = histb_pcie_probe,
444-
.remove = histb_pcie_remove,
442+
.remove_new = histb_pcie_remove,
445443
.driver = {
446444
.name = "histb-pcie",
447445
.of_match_table = histb_pcie_of_match,

‎drivers/pci/controller/dwc/pcie-intel-gw.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,15 +340,13 @@ static void __intel_pcie_remove(struct intel_pcie *pcie)
340340
phy_exit(pcie->phy);
341341
}
342342

343-
static int intel_pcie_remove(struct platform_device *pdev)
343+
static void intel_pcie_remove(struct platform_device *pdev)
344344
{
345345
struct intel_pcie *pcie = platform_get_drvdata(pdev);
346346
struct dw_pcie_rp *pp = &pcie->pci.pp;
347347

348348
dw_pcie_host_deinit(pp);
349349
__intel_pcie_remove(pcie);
350-
351-
return 0;
352350
}
353351

354352
static int intel_pcie_suspend_noirq(struct device *dev)
@@ -443,7 +441,7 @@ static const struct of_device_id of_intel_pcie_match[] = {
443441

444442
static struct platform_driver intel_pcie_driver = {
445443
.probe = intel_pcie_probe,
446-
.remove = intel_pcie_remove,
444+
.remove_new = intel_pcie_remove,
447445
.driver = {
448446
.name = "intel-gw-pcie",
449447
.of_match_table = of_intel_pcie_match,

‎drivers/pci/controller/dwc/pcie-qcom-ep.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ static int qcom_pcie_ep_probe(struct platform_device *pdev)
786786
return ret;
787787
}
788788

789-
static int qcom_pcie_ep_remove(struct platform_device *pdev)
789+
static void qcom_pcie_ep_remove(struct platform_device *pdev)
790790
{
791791
struct qcom_pcie_ep *pcie_ep = platform_get_drvdata(pdev);
792792

@@ -796,11 +796,9 @@ static int qcom_pcie_ep_remove(struct platform_device *pdev)
796796
debugfs_remove_recursive(pcie_ep->debugfs);
797797

798798
if (pcie_ep->link_status == QCOM_PCIE_EP_LINK_DISABLED)
799-
return 0;
799+
return;
800800

801801
qcom_pcie_disable_resources(pcie_ep);
802-
803-
return 0;
804802
}
805803

806804
static const struct of_device_id qcom_pcie_ep_match[] = {
@@ -812,7 +810,7 @@ MODULE_DEVICE_TABLE(of, qcom_pcie_ep_match);
812810

813811
static struct platform_driver qcom_pcie_ep_driver = {
814812
.probe = qcom_pcie_ep_probe,
815-
.remove = qcom_pcie_ep_remove,
813+
.remove_new = qcom_pcie_ep_remove,
816814
.driver = {
817815
.name = "qcom-pcie-ep",
818816
.of_match_table = qcom_pcie_ep_match,

‎drivers/pci/controller/dwc/pcie-tegra194.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2268,13 +2268,13 @@ static int tegra_pcie_dw_probe(struct platform_device *pdev)
22682268
return ret;
22692269
}
22702270

2271-
static int tegra_pcie_dw_remove(struct platform_device *pdev)
2271+
static void tegra_pcie_dw_remove(struct platform_device *pdev)
22722272
{
22732273
struct tegra_pcie_dw *pcie = platform_get_drvdata(pdev);
22742274

22752275
if (pcie->of_data->mode == DW_PCIE_RC_TYPE) {
22762276
if (!pcie->link_state)
2277-
return 0;
2277+
return;
22782278

22792279
debugfs_remove_recursive(pcie->debugfs);
22802280
tegra_pcie_deinit_controller(pcie);
@@ -2288,8 +2288,6 @@ static int tegra_pcie_dw_remove(struct platform_device *pdev)
22882288
tegra_bpmp_put(pcie->bpmp);
22892289
if (pcie->pex_refclk_sel_gpiod)
22902290
gpiod_set_value(pcie->pex_refclk_sel_gpiod, 0);
2291-
2292-
return 0;
22932291
}
22942292

22952293
static int tegra_pcie_dw_suspend_late(struct device *dev)
@@ -2483,7 +2481,7 @@ static const struct dev_pm_ops tegra_pcie_dw_pm_ops = {
24832481

24842482
static struct platform_driver tegra_pcie_dw_driver = {
24852483
.probe = tegra_pcie_dw_probe,
2486-
.remove = tegra_pcie_dw_remove,
2484+
.remove_new = tegra_pcie_dw_remove,
24872485
.shutdown = tegra_pcie_dw_shutdown,
24882486
.driver = {
24892487
.name = "tegra194-pcie",

‎drivers/pci/controller/pci-aardvark.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1927,7 +1927,7 @@ static int advk_pcie_probe(struct platform_device *pdev)
19271927
return 0;
19281928
}
19291929

1930-
static int advk_pcie_remove(struct platform_device *pdev)
1930+
static void advk_pcie_remove(struct platform_device *pdev)
19311931
{
19321932
struct advk_pcie *pcie = platform_get_drvdata(pdev);
19331933
struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
@@ -1989,8 +1989,6 @@ static int advk_pcie_remove(struct platform_device *pdev)
19891989

19901990
/* Disable phy */
19911991
advk_pcie_disable_phy(pcie);
1992-
1993-
return 0;
19941992
}
19951993

19961994
static const struct of_device_id advk_pcie_of_match_table[] = {
@@ -2005,7 +2003,7 @@ static struct platform_driver advk_pcie_driver = {
20052003
.of_match_table = advk_pcie_of_match_table,
20062004
},
20072005
.probe = advk_pcie_probe,
2008-
.remove = advk_pcie_remove,
2006+
.remove_new = advk_pcie_remove,
20092007
};
20102008
module_platform_driver(advk_pcie_driver);
20112009

‎drivers/pci/controller/pci-mvebu.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,7 +1649,7 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
16491649
return pci_host_probe(bridge);
16501650
}
16511651

1652-
static int mvebu_pcie_remove(struct platform_device *pdev)
1652+
static void mvebu_pcie_remove(struct platform_device *pdev)
16531653
{
16541654
struct mvebu_pcie *pcie = platform_get_drvdata(pdev);
16551655
struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
@@ -1707,8 +1707,6 @@ static int mvebu_pcie_remove(struct platform_device *pdev)
17071707
/* Power down card and disable clocks. Must be the last step. */
17081708
mvebu_pcie_powerdown(port);
17091709
}
1710-
1711-
return 0;
17121710
}
17131711

17141712
static const struct of_device_id mvebu_pcie_of_match_table[] = {
@@ -1730,7 +1728,7 @@ static struct platform_driver mvebu_pcie_driver = {
17301728
.pm = &mvebu_pcie_pm_ops,
17311729
},
17321730
.probe = mvebu_pcie_probe,
1733-
.remove = mvebu_pcie_remove,
1731+
.remove_new = mvebu_pcie_remove,
17341732
};
17351733
module_platform_driver(mvebu_pcie_driver);
17361734

‎drivers/pci/controller/pci-tegra.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2680,7 +2680,7 @@ static int tegra_pcie_probe(struct platform_device *pdev)
26802680
return err;
26812681
}
26822682

2683-
static int tegra_pcie_remove(struct platform_device *pdev)
2683+
static void tegra_pcie_remove(struct platform_device *pdev)
26842684
{
26852685
struct tegra_pcie *pcie = platform_get_drvdata(pdev);
26862686
struct pci_host_bridge *host = pci_host_bridge_from_priv(pcie);
@@ -2701,8 +2701,6 @@ static int tegra_pcie_remove(struct platform_device *pdev)
27012701

27022702
list_for_each_entry_safe(port, tmp, &pcie->ports, list)
27032703
tegra_pcie_port_free(port);
2704-
2705-
return 0;
27062704
}
27072705

27082706
static int tegra_pcie_pm_suspend(struct device *dev)
@@ -2808,6 +2806,6 @@ static struct platform_driver tegra_pcie_driver = {
28082806
.pm = &tegra_pcie_pm_ops,
28092807
},
28102808
.probe = tegra_pcie_probe,
2811-
.remove = tegra_pcie_remove,
2809+
.remove_new = tegra_pcie_remove,
28122810
};
28132811
module_platform_driver(tegra_pcie_driver);

‎drivers/pci/controller/pci-xgene-msi.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ static void xgene_msi_isr(struct irq_desc *desc)
348348

349349
static enum cpuhp_state pci_xgene_online;
350350

351-
static int xgene_msi_remove(struct platform_device *pdev)
351+
static void xgene_msi_remove(struct platform_device *pdev)
352352
{
353353
struct xgene_msi *msi = platform_get_drvdata(pdev);
354354

@@ -362,8 +362,6 @@ static int xgene_msi_remove(struct platform_device *pdev)
362362
msi->bitmap = NULL;
363363

364364
xgene_free_domains(msi);
365-
366-
return 0;
367365
}
368366

369367
static int xgene_msi_hwirq_alloc(unsigned int cpu)
@@ -521,7 +519,7 @@ static struct platform_driver xgene_msi_driver = {
521519
.of_match_table = xgene_msi_match_table,
522520
},
523521
.probe = xgene_msi_probe,
524-
.remove = xgene_msi_remove,
522+
.remove_new = xgene_msi_remove,
525523
};
526524

527525
static int __init xgene_pcie_msi_init(void)

‎drivers/pci/controller/pcie-altera-msi.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ static void altera_free_domains(struct altera_msi *msi)
197197
irq_domain_remove(msi->inner_domain);
198198
}
199199

200-
static int altera_msi_remove(struct platform_device *pdev)
200+
static void altera_msi_remove(struct platform_device *pdev)
201201
{
202202
struct altera_msi *msi = platform_get_drvdata(pdev);
203203

@@ -207,7 +207,6 @@ static int altera_msi_remove(struct platform_device *pdev)
207207
altera_free_domains(msi);
208208

209209
platform_set_drvdata(pdev, NULL);
210-
return 0;
211210
}
212211

213212
static int altera_msi_probe(struct platform_device *pdev)
@@ -275,7 +274,7 @@ static struct platform_driver altera_msi_driver = {
275274
.of_match_table = altera_msi_of_match,
276275
},
277276
.probe = altera_msi_probe,
278-
.remove = altera_msi_remove,
277+
.remove_new = altera_msi_remove,
279278
};
280279

281280
static int __init altera_msi_init(void)

‎drivers/pci/controller/pcie-altera.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -806,21 +806,19 @@ static int altera_pcie_probe(struct platform_device *pdev)
806806
return pci_host_probe(bridge);
807807
}
808808

809-
static int altera_pcie_remove(struct platform_device *pdev)
809+
static void altera_pcie_remove(struct platform_device *pdev)
810810
{
811811
struct altera_pcie *pcie = platform_get_drvdata(pdev);
812812
struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
813813

814814
pci_stop_root_bus(bridge->bus);
815815
pci_remove_root_bus(bridge->bus);
816816
altera_pcie_irq_teardown(pcie);
817-
818-
return 0;
819817
}
820818

821819
static struct platform_driver altera_pcie_driver = {
822820
.probe = altera_pcie_probe,
823-
.remove = altera_pcie_remove,
821+
.remove_new = altera_pcie_remove,
824822
.driver = {
825823
.name = "altera-pcie",
826824
.of_match_table = altera_pcie_of_match,

‎drivers/pci/controller/pcie-brcmstb.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,16 +1396,14 @@ static void __brcm_pcie_remove(struct brcm_pcie *pcie)
13961396
clk_disable_unprepare(pcie->clk);
13971397
}
13981398

1399-
static int brcm_pcie_remove(struct platform_device *pdev)
1399+
static void brcm_pcie_remove(struct platform_device *pdev)
14001400
{
14011401
struct brcm_pcie *pcie = platform_get_drvdata(pdev);
14021402
struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
14031403

14041404
pci_stop_root_bus(bridge->bus);
14051405
pci_remove_root_bus(bridge->bus);
14061406
__brcm_pcie_remove(pcie);
1407-
1408-
return 0;
14091407
}
14101408

14111409
static const int pcie_offsets[] = {
@@ -1612,7 +1610,7 @@ static const struct dev_pm_ops brcm_pcie_pm_ops = {
16121610

16131611
static struct platform_driver brcm_pcie_driver = {
16141612
.probe = brcm_pcie_probe,
1615-
.remove = brcm_pcie_remove,
1613+
.remove_new = brcm_pcie_remove,
16161614
.driver = {
16171615
.name = "brcm-pcie",
16181616
.of_match_table = brcm_pcie_match,

‎drivers/pci/controller/pcie-hisi-error.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,13 +299,11 @@ static int hisi_pcie_error_handler_probe(struct platform_device *pdev)
299299
return 0;
300300
}
301301

302-
static int hisi_pcie_error_handler_remove(struct platform_device *pdev)
302+
static void hisi_pcie_error_handler_remove(struct platform_device *pdev)
303303
{
304304
struct hisi_pcie_error_private *priv = platform_get_drvdata(pdev);
305305

306306
ghes_unregister_vendor_record_notifier(&priv->nb);
307-
308-
return 0;
309307
}
310308

311309
static const struct acpi_device_id hisi_pcie_acpi_match[] = {
@@ -319,7 +317,7 @@ static struct platform_driver hisi_pcie_error_handler_driver = {
319317
.acpi_match_table = hisi_pcie_acpi_match,
320318
},
321319
.probe = hisi_pcie_error_handler_probe,
322-
.remove = hisi_pcie_error_handler_remove,
320+
.remove_new = hisi_pcie_error_handler_remove,
323321
};
324322
module_platform_driver(hisi_pcie_error_handler_driver);
325323

‎drivers/pci/controller/pcie-iproc-platform.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ static int iproc_pltfm_pcie_probe(struct platform_device *pdev)
114114
return 0;
115115
}
116116

117-
static int iproc_pltfm_pcie_remove(struct platform_device *pdev)
117+
static void iproc_pltfm_pcie_remove(struct platform_device *pdev)
118118
{
119119
struct iproc_pcie *pcie = platform_get_drvdata(pdev);
120120

121-
return iproc_pcie_remove(pcie);
121+
iproc_pcie_remove(pcie);
122122
}
123123

124124
static void iproc_pltfm_pcie_shutdown(struct platform_device *pdev)
@@ -134,7 +134,7 @@ static struct platform_driver iproc_pltfm_pcie_driver = {
134134
.of_match_table = of_match_ptr(iproc_pcie_of_match_table),
135135
},
136136
.probe = iproc_pltfm_pcie_probe,
137-
.remove = iproc_pltfm_pcie_remove,
137+
.remove_new = iproc_pltfm_pcie_remove,
138138
.shutdown = iproc_pltfm_pcie_shutdown,
139139
};
140140
module_platform_driver(iproc_pltfm_pcie_driver);

0 commit comments

Comments
 (0)