Skip to content

Commit 1a075b1

Browse files
ukleineklinusw
authored andcommitted
pinctrl: 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/pinctrl 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/[email protected] Signed-off-by: Linus Walleij <[email protected]>
1 parent 1fc30cd commit 1a075b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+75
-75
lines changed

drivers/pinctrl/cirrus/pinctrl-madera-core.c

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

10921092
static struct platform_driver madera_pin_driver = {
10931093
.probe = madera_pin_probe,
1094-
.remove_new = madera_pin_remove,
1094+
.remove = madera_pin_remove,
10951095
.driver = {
10961096
.name = "madera-pinctrl",
10971097
},

drivers/pinctrl/intel/pinctrl-cherryview.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1792,7 +1792,7 @@ MODULE_DEVICE_TABLE(acpi, chv_pinctrl_acpi_match);
17921792

17931793
static struct platform_driver chv_pinctrl_driver = {
17941794
.probe = chv_pinctrl_probe,
1795-
.remove_new = chv_pinctrl_remove,
1795+
.remove = chv_pinctrl_remove,
17961796
.driver = {
17971797
.name = "cherryview-pinctrl",
17981798
.pm = pm_sleep_ptr(&chv_pinctrl_pm_ops),

drivers/pinctrl/nomadik/pinctrl-abx500.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@ static struct platform_driver abx500_gpio_driver = {
10891089
.of_match_table = abx500_gpio_match,
10901090
},
10911091
.probe = abx500_gpio_probe,
1092-
.remove_new = abx500_gpio_remove,
1092+
.remove = abx500_gpio_remove,
10931093
};
10941094

10951095
static int __init abx500_gpio_init(void)

drivers/pinctrl/pinctrl-amd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1204,7 +1204,7 @@ static struct platform_driver amd_gpio_driver = {
12041204
#endif
12051205
},
12061206
.probe = amd_gpio_probe,
1207-
.remove_new = amd_gpio_remove,
1207+
.remove = amd_gpio_remove,
12081208
};
12091209

12101210
module_platform_driver(amd_gpio_driver);

drivers/pinctrl/pinctrl-artpec6.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ static struct platform_driver artpec6_pmx_driver = {
988988
.of_match_table = artpec6_pinctrl_match,
989989
},
990990
.probe = artpec6_pmx_probe,
991-
.remove_new = artpec6_pmx_remove,
991+
.remove = artpec6_pmx_remove,
992992
};
993993

994994
static int __init artpec6_pmx_init(void)

drivers/pinctrl/pinctrl-rockchip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4221,7 +4221,7 @@ static const struct of_device_id rockchip_pinctrl_dt_match[] = {
42214221

42224222
static struct platform_driver rockchip_pinctrl_driver = {
42234223
.probe = rockchip_pinctrl_probe,
4224-
.remove_new = rockchip_pinctrl_remove,
4224+
.remove = rockchip_pinctrl_remove,
42254225
.driver = {
42264226
.name = "rockchip-pinctrl",
42274227
.pm = &rockchip_pinctrl_dev_pm_ops,

drivers/pinctrl/pinctrl-single.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1981,7 +1981,7 @@ MODULE_DEVICE_TABLE(of, pcs_of_match);
19811981

19821982
static struct platform_driver pcs_driver = {
19831983
.probe = pcs_probe,
1984-
.remove_new = pcs_remove,
1984+
.remove = pcs_remove,
19851985
.driver = {
19861986
.name = DRIVER_NAME,
19871987
.of_match_table = pcs_of_match,

drivers/pinctrl/pinctrl-stmfx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ static struct platform_driver stmfx_pinctrl_driver = {
855855
.pm = &stmfx_pinctrl_dev_pm_ops,
856856
},
857857
.probe = stmfx_pinctrl_probe,
858-
.remove_new = stmfx_pinctrl_remove,
858+
.remove = stmfx_pinctrl_remove,
859859
};
860860
module_platform_driver(stmfx_pinctrl_driver);
861861

drivers/pinctrl/pinctrl-tb10x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ MODULE_DEVICE_TABLE(of, tb10x_pinctrl_dt_ids);
820820

821821
static struct platform_driver tb10x_pinctrl_pdrv = {
822822
.probe = tb10x_pinctrl_probe,
823-
.remove_new = tb10x_pinctrl_remove,
823+
.remove = tb10x_pinctrl_remove,
824824
.driver = {
825825
.name = "tb10x_pinctrl",
826826
.of_match_table = of_match_ptr(tb10x_pinctrl_dt_ids),

drivers/pinctrl/qcom/pinctrl-apq8064.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ static struct platform_driver apq8064_pinctrl_driver = {
629629
.of_match_table = apq8064_pinctrl_of_match,
630630
},
631631
.probe = apq8064_pinctrl_probe,
632-
.remove_new = msm_pinctrl_remove,
632+
.remove = msm_pinctrl_remove,
633633
};
634634

635635
static int __init apq8064_pinctrl_init(void)

0 commit comments

Comments
 (0)