File tree Expand file tree Collapse file tree 5 files changed +12
-22
lines changed
drivers/pci/controller/dwc Expand file tree Collapse file tree 5 files changed +12
-22
lines changed Original file line number Diff line number Diff line change @@ -617,13 +617,11 @@ static int bt1_pcie_probe(struct platform_device *pdev)
617
617
return bt1_pcie_add_port (btpci );
618
618
}
619
619
620
- static int bt1_pcie_remove (struct platform_device * pdev )
620
+ static void bt1_pcie_remove (struct platform_device * pdev )
621
621
{
622
622
struct bt1_pcie * btpci = platform_get_drvdata (pdev );
623
623
624
624
bt1_pcie_del_port (btpci );
625
-
626
- return 0 ;
627
625
}
628
626
629
627
static const struct of_device_id bt1_pcie_of_match [] = {
@@ -634,7 +632,7 @@ MODULE_DEVICE_TABLE(of, bt1_pcie_of_match);
634
632
635
633
static struct platform_driver bt1_pcie_driver = {
636
634
.probe = bt1_pcie_probe ,
637
- .remove = bt1_pcie_remove ,
635
+ .remove_new = bt1_pcie_remove ,
638
636
.driver = {
639
637
.name = "bt1-pcie" ,
640
638
.of_match_table = bt1_pcie_of_match ,
Original file line number Diff line number Diff line change @@ -421,16 +421,14 @@ static int histb_pcie_probe(struct platform_device *pdev)
421
421
return 0 ;
422
422
}
423
423
424
- static int histb_pcie_remove (struct platform_device * pdev )
424
+ static void histb_pcie_remove (struct platform_device * pdev )
425
425
{
426
426
struct histb_pcie * hipcie = platform_get_drvdata (pdev );
427
427
428
428
histb_pcie_host_disable (hipcie );
429
429
430
430
if (hipcie -> phy )
431
431
phy_exit (hipcie -> phy );
432
-
433
- return 0 ;
434
432
}
435
433
436
434
static const struct of_device_id histb_pcie_of_match [] = {
@@ -441,7 +439,7 @@ MODULE_DEVICE_TABLE(of, histb_pcie_of_match);
441
439
442
440
static struct platform_driver histb_pcie_platform_driver = {
443
441
.probe = histb_pcie_probe ,
444
- .remove = histb_pcie_remove ,
442
+ .remove_new = histb_pcie_remove ,
445
443
.driver = {
446
444
.name = "histb-pcie" ,
447
445
.of_match_table = histb_pcie_of_match ,
Original file line number Diff line number Diff line change @@ -340,15 +340,13 @@ static void __intel_pcie_remove(struct intel_pcie *pcie)
340
340
phy_exit (pcie -> phy );
341
341
}
342
342
343
- static int intel_pcie_remove (struct platform_device * pdev )
343
+ static void intel_pcie_remove (struct platform_device * pdev )
344
344
{
345
345
struct intel_pcie * pcie = platform_get_drvdata (pdev );
346
346
struct dw_pcie_rp * pp = & pcie -> pci .pp ;
347
347
348
348
dw_pcie_host_deinit (pp );
349
349
__intel_pcie_remove (pcie );
350
-
351
- return 0 ;
352
350
}
353
351
354
352
static int intel_pcie_suspend_noirq (struct device * dev )
@@ -443,7 +441,7 @@ static const struct of_device_id of_intel_pcie_match[] = {
443
441
444
442
static struct platform_driver intel_pcie_driver = {
445
443
.probe = intel_pcie_probe ,
446
- .remove = intel_pcie_remove ,
444
+ .remove_new = intel_pcie_remove ,
447
445
.driver = {
448
446
.name = "intel-gw-pcie" ,
449
447
.of_match_table = of_intel_pcie_match ,
Original file line number Diff line number Diff line change @@ -784,7 +784,7 @@ static int qcom_pcie_ep_probe(struct platform_device *pdev)
784
784
return ret ;
785
785
}
786
786
787
- static int qcom_pcie_ep_remove (struct platform_device * pdev )
787
+ static void qcom_pcie_ep_remove (struct platform_device * pdev )
788
788
{
789
789
struct qcom_pcie_ep * pcie_ep = platform_get_drvdata (pdev );
790
790
@@ -794,11 +794,9 @@ static int qcom_pcie_ep_remove(struct platform_device *pdev)
794
794
debugfs_remove_recursive (pcie_ep -> debugfs );
795
795
796
796
if (pcie_ep -> link_status == QCOM_PCIE_EP_LINK_DISABLED )
797
- return 0 ;
797
+ return ;
798
798
799
799
qcom_pcie_disable_resources (pcie_ep );
800
-
801
- return 0 ;
802
800
}
803
801
804
802
static const struct of_device_id qcom_pcie_ep_match [] = {
@@ -810,7 +808,7 @@ MODULE_DEVICE_TABLE(of, qcom_pcie_ep_match);
810
808
811
809
static struct platform_driver qcom_pcie_ep_driver = {
812
810
.probe = qcom_pcie_ep_probe ,
813
- .remove = qcom_pcie_ep_remove ,
811
+ .remove_new = qcom_pcie_ep_remove ,
814
812
.driver = {
815
813
.name = "qcom-pcie-ep" ,
816
814
.of_match_table = qcom_pcie_ep_match ,
Original file line number Diff line number Diff line change @@ -2268,13 +2268,13 @@ static int tegra_pcie_dw_probe(struct platform_device *pdev)
2268
2268
return ret ;
2269
2269
}
2270
2270
2271
- static int tegra_pcie_dw_remove (struct platform_device * pdev )
2271
+ static void tegra_pcie_dw_remove (struct platform_device * pdev )
2272
2272
{
2273
2273
struct tegra_pcie_dw * pcie = platform_get_drvdata (pdev );
2274
2274
2275
2275
if (pcie -> of_data -> mode == DW_PCIE_RC_TYPE ) {
2276
2276
if (!pcie -> link_state )
2277
- return 0 ;
2277
+ return ;
2278
2278
2279
2279
debugfs_remove_recursive (pcie -> debugfs );
2280
2280
tegra_pcie_deinit_controller (pcie );
@@ -2288,8 +2288,6 @@ static int tegra_pcie_dw_remove(struct platform_device *pdev)
2288
2288
tegra_bpmp_put (pcie -> bpmp );
2289
2289
if (pcie -> pex_refclk_sel_gpiod )
2290
2290
gpiod_set_value (pcie -> pex_refclk_sel_gpiod , 0 );
2291
-
2292
- return 0 ;
2293
2291
}
2294
2292
2295
2293
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 = {
2483
2481
2484
2482
static struct platform_driver tegra_pcie_dw_driver = {
2485
2483
.probe = tegra_pcie_dw_probe ,
2486
- .remove = tegra_pcie_dw_remove ,
2484
+ .remove_new = tegra_pcie_dw_remove ,
2487
2485
.shutdown = tegra_pcie_dw_shutdown ,
2488
2486
.driver = {
2489
2487
.name = "tegra194-pcie" ,
You can’t perform that action at this time.
0 commit comments