Skip to content

Commit 5fe4e16

Browse files
ukleinekmartinkpetersen
authored andcommitted
scsi: ufs: Switch back to struct platform_driver::remove()
After commit 0edb555 ("platform: Make platform_driver::remove() return void") .remove() is (again) the right callback to implement for platform drivers. Convert all platform drivers below drivers/ufs to use .remove(), with the eventual goal to drop struct platform_driver::remove_new(). As .remove() and .remove_new() have the same prototypes, conversion is done by just changing the structure member name in the driver initializer. Signed-off-by: Uwe Kleine-König <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 575143a commit 5fe4e16

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

drivers/ufs/host/cdns-pltfrm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ static const struct dev_pm_ops cdns_ufs_dev_pm_ops = {
321321

322322
static struct platform_driver cdns_ufs_pltfrm_driver = {
323323
.probe = cdns_ufs_pltfrm_probe,
324-
.remove_new = cdns_ufs_pltfrm_remove,
324+
.remove = cdns_ufs_pltfrm_remove,
325325
.driver = {
326326
.name = "cdns-ufshcd",
327327
.pm = &cdns_ufs_dev_pm_ops,

drivers/ufs/host/tc-dwc-g210-pltfrm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ static const struct dev_pm_ops tc_dwc_g210_pltfm_pm_ops = {
8989

9090
static struct platform_driver tc_dwc_g210_pltfm_driver = {
9191
.probe = tc_dwc_g210_pltfm_probe,
92-
.remove_new = tc_dwc_g210_pltfm_remove,
92+
.remove = tc_dwc_g210_pltfm_remove,
9393
.driver = {
9494
.name = "tc-dwc-g210-pltfm",
9595
.pm = &tc_dwc_g210_pltfm_pm_ops,

drivers/ufs/host/ti-j721e-ufs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ MODULE_DEVICE_TABLE(of, ti_j721e_ufs_of_match);
8383

8484
static struct platform_driver ti_j721e_ufs_driver = {
8585
.probe = ti_j721e_ufs_probe,
86-
.remove_new = ti_j721e_ufs_remove,
86+
.remove = ti_j721e_ufs_remove,
8787
.driver = {
8888
.name = "ti-j721e-ufs",
8989
.of_match_table = ti_j721e_ufs_of_match,

drivers/ufs/host/ufs-exynos.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2166,7 +2166,7 @@ static const struct dev_pm_ops exynos_ufs_pm_ops = {
21662166

21672167
static struct platform_driver exynos_ufs_pltform = {
21682168
.probe = exynos_ufs_probe,
2169-
.remove_new = exynos_ufs_remove,
2169+
.remove = exynos_ufs_remove,
21702170
.driver = {
21712171
.name = "exynos-ufshc",
21722172
.pm = &exynos_ufs_pm_ops,

drivers/ufs/host/ufs-hisi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ static const struct dev_pm_ops ufs_hisi_pm_ops = {
590590

591591
static struct platform_driver ufs_hisi_pltform = {
592592
.probe = ufs_hisi_probe,
593-
.remove_new = ufs_hisi_remove,
593+
.remove = ufs_hisi_remove,
594594
.driver = {
595595
.name = "ufshcd-hisi",
596596
.pm = &ufs_hisi_pm_ops,

drivers/ufs/host/ufs-mediatek.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1962,7 +1962,7 @@ static const struct dev_pm_ops ufs_mtk_pm_ops = {
19621962

19631963
static struct platform_driver ufs_mtk_pltform = {
19641964
.probe = ufs_mtk_probe,
1965-
.remove_new = ufs_mtk_remove,
1965+
.remove = ufs_mtk_remove,
19661966
.driver = {
19671967
.name = "ufshcd-mtk",
19681968
.pm = &ufs_mtk_pm_ops,

drivers/ufs/host/ufs-qcom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1897,7 +1897,7 @@ static const struct dev_pm_ops ufs_qcom_pm_ops = {
18971897

18981898
static struct platform_driver ufs_qcom_pltform = {
18991899
.probe = ufs_qcom_probe,
1900-
.remove_new = ufs_qcom_remove,
1900+
.remove = ufs_qcom_remove,
19011901
.driver = {
19021902
.name = "ufshcd-qcom",
19031903
.pm = &ufs_qcom_pm_ops,

drivers/ufs/host/ufs-renesas.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ static void ufs_renesas_remove(struct platform_device *pdev)
404404

405405
static struct platform_driver ufs_renesas_platform = {
406406
.probe = ufs_renesas_probe,
407-
.remove_new = ufs_renesas_remove,
407+
.remove = ufs_renesas_remove,
408408
.driver = {
409409
.name = "ufshcd-renesas",
410410
.of_match_table = of_match_ptr(ufs_renesas_of_match),

drivers/ufs/host/ufs-sprd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ static const struct dev_pm_ops ufs_sprd_pm_ops = {
442442

443443
static struct platform_driver ufs_sprd_pltform = {
444444
.probe = ufs_sprd_probe,
445-
.remove_new = ufs_sprd_remove,
445+
.remove = ufs_sprd_remove,
446446
.driver = {
447447
.name = "ufshcd-sprd",
448448
.pm = &ufs_sprd_pm_ops,

0 commit comments

Comments
 (0)