File tree Expand file tree Collapse file tree 9 files changed +18
-31
lines changed Expand file tree Collapse file tree 9 files changed +18
-31
lines changed Original file line number Diff line number Diff line change @@ -305,12 +305,11 @@ static int cdns_ufs_pltfrm_probe(struct platform_device *pdev)
305
305
*
306
306
* Return: 0 (success).
307
307
*/
308
- static int cdns_ufs_pltfrm_remove (struct platform_device * pdev )
308
+ static void cdns_ufs_pltfrm_remove (struct platform_device * pdev )
309
309
{
310
310
struct ufs_hba * hba = platform_get_drvdata (pdev );
311
311
312
312
ufshcd_remove (hba );
313
- return 0 ;
314
313
}
315
314
316
315
static const struct dev_pm_ops cdns_ufs_dev_pm_ops = {
@@ -322,7 +321,7 @@ static const struct dev_pm_ops cdns_ufs_dev_pm_ops = {
322
321
323
322
static struct platform_driver cdns_ufs_pltfrm_driver = {
324
323
.probe = cdns_ufs_pltfrm_probe ,
325
- .remove = cdns_ufs_pltfrm_remove ,
324
+ .remove_new = cdns_ufs_pltfrm_remove ,
326
325
.driver = {
327
326
.name = "cdns-ufshcd" ,
328
327
.pm = & cdns_ufs_dev_pm_ops ,
Original file line number Diff line number Diff line change @@ -74,14 +74,12 @@ static int tc_dwc_g210_pltfm_probe(struct platform_device *pdev)
74
74
* @pdev: pointer to platform device structure
75
75
*
76
76
*/
77
- static int tc_dwc_g210_pltfm_remove (struct platform_device * pdev )
77
+ static void tc_dwc_g210_pltfm_remove (struct platform_device * pdev )
78
78
{
79
79
struct ufs_hba * hba = platform_get_drvdata (pdev );
80
80
81
81
pm_runtime_get_sync (& (pdev )-> dev );
82
82
ufshcd_remove (hba );
83
-
84
- return 0 ;
85
83
}
86
84
87
85
static const struct dev_pm_ops tc_dwc_g210_pltfm_pm_ops = {
@@ -91,7 +89,7 @@ static const struct dev_pm_ops tc_dwc_g210_pltfm_pm_ops = {
91
89
92
90
static struct platform_driver tc_dwc_g210_pltfm_driver = {
93
91
.probe = tc_dwc_g210_pltfm_probe ,
94
- .remove = tc_dwc_g210_pltfm_remove ,
92
+ .remove_new = tc_dwc_g210_pltfm_remove ,
95
93
.driver = {
96
94
.name = "tc-dwc-g210-pltfm" ,
97
95
.pm = & tc_dwc_g210_pltfm_pm_ops ,
Original file line number Diff line number Diff line change @@ -65,13 +65,11 @@ static int ti_j721e_ufs_probe(struct platform_device *pdev)
65
65
return ret ;
66
66
}
67
67
68
- static int ti_j721e_ufs_remove (struct platform_device * pdev )
68
+ static void ti_j721e_ufs_remove (struct platform_device * pdev )
69
69
{
70
70
of_platform_depopulate (& pdev -> dev );
71
71
pm_runtime_put_sync (& pdev -> dev );
72
72
pm_runtime_disable (& pdev -> dev );
73
-
74
- return 0 ;
75
73
}
76
74
77
75
static const struct of_device_id ti_j721e_ufs_of_match [] = {
@@ -85,7 +83,7 @@ MODULE_DEVICE_TABLE(of, ti_j721e_ufs_of_match);
85
83
86
84
static struct platform_driver ti_j721e_ufs_driver = {
87
85
.probe = ti_j721e_ufs_probe ,
88
- .remove = ti_j721e_ufs_remove ,
86
+ .remove_new = ti_j721e_ufs_remove ,
89
87
.driver = {
90
88
.name = "ti-j721e-ufs" ,
91
89
.of_match_table = ti_j721e_ufs_of_match ,
Original file line number Diff line number Diff line change @@ -1605,7 +1605,7 @@ static int exynos_ufs_probe(struct platform_device *pdev)
1605
1605
return err ;
1606
1606
}
1607
1607
1608
- static int exynos_ufs_remove (struct platform_device * pdev )
1608
+ static void exynos_ufs_remove (struct platform_device * pdev )
1609
1609
{
1610
1610
struct ufs_hba * hba = platform_get_drvdata (pdev );
1611
1611
struct exynos_ufs * ufs = ufshcd_get_variant (hba );
@@ -1615,8 +1615,6 @@ static int exynos_ufs_remove(struct platform_device *pdev)
1615
1615
1616
1616
phy_power_off (ufs -> phy );
1617
1617
phy_exit (ufs -> phy );
1618
-
1619
- return 0 ;
1620
1618
}
1621
1619
1622
1620
static struct exynos_ufs_uic_attr exynos7_uic_attr = {
@@ -1756,7 +1754,7 @@ static const struct dev_pm_ops exynos_ufs_pm_ops = {
1756
1754
1757
1755
static struct platform_driver exynos_ufs_pltform = {
1758
1756
.probe = exynos_ufs_probe ,
1759
- .remove = exynos_ufs_remove ,
1757
+ .remove_new = exynos_ufs_remove ,
1760
1758
.driver = {
1761
1759
.name = "exynos-ufshc" ,
1762
1760
.pm = & exynos_ufs_pm_ops ,
Original file line number Diff line number Diff line change @@ -575,12 +575,11 @@ static int ufs_hisi_probe(struct platform_device *pdev)
575
575
return ufshcd_pltfrm_init (pdev , of_id -> data );
576
576
}
577
577
578
- static int ufs_hisi_remove (struct platform_device * pdev )
578
+ static void ufs_hisi_remove (struct platform_device * pdev )
579
579
{
580
580
struct ufs_hba * hba = platform_get_drvdata (pdev );
581
581
582
582
ufshcd_remove (hba );
583
- return 0 ;
584
583
}
585
584
586
585
static const struct dev_pm_ops ufs_hisi_pm_ops = {
@@ -592,7 +591,7 @@ static const struct dev_pm_ops ufs_hisi_pm_ops = {
592
591
593
592
static struct platform_driver ufs_hisi_pltform = {
594
593
.probe = ufs_hisi_probe ,
595
- .remove = ufs_hisi_remove ,
594
+ .remove_new = ufs_hisi_remove ,
596
595
.driver = {
597
596
.name = "ufshcd-hisi" ,
598
597
.pm = & ufs_hisi_pm_ops ,
Original file line number Diff line number Diff line change @@ -1748,13 +1748,12 @@ static int ufs_mtk_probe(struct platform_device *pdev)
1748
1748
*
1749
1749
* Always return 0
1750
1750
*/
1751
- static int ufs_mtk_remove (struct platform_device * pdev )
1751
+ static void ufs_mtk_remove (struct platform_device * pdev )
1752
1752
{
1753
1753
struct ufs_hba * hba = platform_get_drvdata (pdev );
1754
1754
1755
1755
pm_runtime_get_sync (& (pdev )-> dev );
1756
1756
ufshcd_remove (hba );
1757
- return 0 ;
1758
1757
}
1759
1758
1760
1759
#ifdef CONFIG_PM_SLEEP
@@ -1818,7 +1817,7 @@ static const struct dev_pm_ops ufs_mtk_pm_ops = {
1818
1817
1819
1818
static struct platform_driver ufs_mtk_pltform = {
1820
1819
.probe = ufs_mtk_probe ,
1821
- .remove = ufs_mtk_remove ,
1820
+ .remove_new = ufs_mtk_remove ,
1822
1821
.driver = {
1823
1822
.name = "ufshcd-mtk" ,
1824
1823
.pm = & ufs_mtk_pm_ops ,
Original file line number Diff line number Diff line change @@ -2031,14 +2031,13 @@ static int ufs_qcom_probe(struct platform_device *pdev)
2031
2031
*
2032
2032
* Always returns 0
2033
2033
*/
2034
- static int ufs_qcom_remove (struct platform_device * pdev )
2034
+ static void ufs_qcom_remove (struct platform_device * pdev )
2035
2035
{
2036
2036
struct ufs_hba * hba = platform_get_drvdata (pdev );
2037
2037
2038
2038
pm_runtime_get_sync (& (pdev )-> dev );
2039
2039
ufshcd_remove (hba );
2040
2040
platform_msi_domain_free_irqs (hba -> dev );
2041
- return 0 ;
2042
2041
}
2043
2042
2044
2043
static const struct of_device_id ufs_qcom_of_match [] __maybe_unused = {
@@ -2070,7 +2069,7 @@ static const struct dev_pm_ops ufs_qcom_pm_ops = {
2070
2069
2071
2070
static struct platform_driver ufs_qcom_pltform = {
2072
2071
.probe = ufs_qcom_probe ,
2073
- .remove = ufs_qcom_remove ,
2072
+ .remove_new = ufs_qcom_remove ,
2074
2073
.driver = {
2075
2074
.name = "ufshcd-qcom" ,
2076
2075
.pm = & ufs_qcom_pm_ops ,
Original file line number Diff line number Diff line change @@ -388,18 +388,16 @@ static int ufs_renesas_probe(struct platform_device *pdev)
388
388
return ufshcd_pltfrm_init (pdev , & ufs_renesas_vops );
389
389
}
390
390
391
- static int ufs_renesas_remove (struct platform_device * pdev )
391
+ static void ufs_renesas_remove (struct platform_device * pdev )
392
392
{
393
393
struct ufs_hba * hba = platform_get_drvdata (pdev );
394
394
395
395
ufshcd_remove (hba );
396
-
397
- return 0 ;
398
396
}
399
397
400
398
static struct platform_driver ufs_renesas_platform = {
401
399
.probe = ufs_renesas_probe ,
402
- .remove = ufs_renesas_remove ,
400
+ .remove_new = ufs_renesas_remove ,
403
401
.driver = {
404
402
.name = "ufshcd-renesas" ,
405
403
.of_match_table = of_match_ptr (ufs_renesas_of_match ),
Original file line number Diff line number Diff line change @@ -425,13 +425,12 @@ static int ufs_sprd_probe(struct platform_device *pdev)
425
425
return err ;
426
426
}
427
427
428
- static int ufs_sprd_remove (struct platform_device * pdev )
428
+ static void ufs_sprd_remove (struct platform_device * pdev )
429
429
{
430
430
struct ufs_hba * hba = platform_get_drvdata (pdev );
431
431
432
432
pm_runtime_get_sync (& (pdev )-> dev );
433
433
ufshcd_remove (hba );
434
- return 0 ;
435
434
}
436
435
437
436
static const struct dev_pm_ops ufs_sprd_pm_ops = {
@@ -443,7 +442,7 @@ static const struct dev_pm_ops ufs_sprd_pm_ops = {
443
442
444
443
static struct platform_driver ufs_sprd_pltform = {
445
444
.probe = ufs_sprd_probe ,
446
- .remove = ufs_sprd_remove ,
445
+ .remove_new = ufs_sprd_remove ,
447
446
.driver = {
448
447
.name = "ufshcd-sprd" ,
449
448
.pm = & ufs_sprd_pm_ops ,
You can’t perform that action at this time.
0 commit comments