Skip to content

Commit 1fac9f8

Browse files
ukleinekarndb
authored andcommitted
bus: 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/bus 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]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent 71ad2b0 commit 1fac9f8

File tree

13 files changed

+13
-13
lines changed

13 files changed

+13
-13
lines changed

drivers/bus/fsl-mc/fsl-mc-bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,7 @@ static struct platform_driver fsl_mc_bus_driver = {
12101210
.acpi_match_table = fsl_mc_bus_acpi_match_table,
12111211
},
12121212
.probe = fsl_mc_bus_probe,
1213-
.remove_new = fsl_mc_bus_remove,
1213+
.remove = fsl_mc_bus_remove,
12141214
.shutdown = fsl_mc_bus_remove,
12151215
};
12161216

drivers/bus/hisi_lpc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,6 @@ static struct platform_driver hisi_lpc_driver = {
689689
.acpi_match_table = hisi_lpc_acpi_match,
690690
},
691691
.probe = hisi_lpc_probe,
692-
.remove_new = hisi_lpc_remove,
692+
.remove = hisi_lpc_remove,
693693
};
694694
builtin_platform_driver(hisi_lpc_driver);

drivers/bus/omap-ocp2scp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ MODULE_DEVICE_TABLE(of, omap_ocp2scp_id_table);
101101

102102
static struct platform_driver omap_ocp2scp_driver = {
103103
.probe = omap_ocp2scp_probe,
104-
.remove_new = omap_ocp2scp_remove,
104+
.remove = omap_ocp2scp_remove,
105105
.driver = {
106106
.name = "omap-ocp2scp",
107107
.of_match_table = of_match_ptr(omap_ocp2scp_id_table),

drivers/bus/omap_l3_smx.c

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

274274
static struct platform_driver omap3_l3_driver = {
275275
.probe = omap3_l3_probe,
276-
.remove_new = omap3_l3_remove,
276+
.remove = omap3_l3_remove,
277277
.driver = {
278278
.name = "omap_l3_smx",
279279
.of_match_table = of_match_ptr(omap3_l3_match),

drivers/bus/qcom-ssc-block-bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ MODULE_DEVICE_TABLE(of, qcom_ssc_block_bus_of_match);
373373

374374
static struct platform_driver qcom_ssc_block_bus_driver = {
375375
.probe = qcom_ssc_block_bus_probe,
376-
.remove_new = qcom_ssc_block_bus_remove,
376+
.remove = qcom_ssc_block_bus_remove,
377377
.driver = {
378378
.name = "qcom-ssc-block-bus",
379379
.of_match_table = qcom_ssc_block_bus_of_match,

drivers/bus/simple-pm-bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ MODULE_DEVICE_TABLE(of, simple_pm_bus_of_match);
128128

129129
static struct platform_driver simple_pm_bus_driver = {
130130
.probe = simple_pm_bus_probe,
131-
.remove_new = simple_pm_bus_remove,
131+
.remove = simple_pm_bus_remove,
132132
.driver = {
133133
.name = "simple-pm-bus",
134134
.of_match_table = simple_pm_bus_of_match,

drivers/bus/sun50i-de2.c

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

3737
static struct platform_driver sun50i_de2_bus_driver = {
3838
.probe = sun50i_de2_bus_probe,
39-
.remove_new = sun50i_de2_bus_remove,
39+
.remove = sun50i_de2_bus_remove,
4040
.driver = {
4141
.name = "sun50i-de2-bus",
4242
.of_match_table = sun50i_de2_bus_of_match,

drivers/bus/sunxi-rsb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ MODULE_DEVICE_TABLE(of, sunxi_rsb_of_match_table);
832832

833833
static struct platform_driver sunxi_rsb_driver = {
834834
.probe = sunxi_rsb_probe,
835-
.remove_new = sunxi_rsb_remove,
835+
.remove = sunxi_rsb_remove,
836836
.driver = {
837837
.name = RSB_CTRL_NAME,
838838
.of_match_table = sunxi_rsb_of_match_table,

drivers/bus/tegra-aconnect.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ MODULE_DEVICE_TABLE(of, tegra_aconnect_of_match);
104104

105105
static struct platform_driver tegra_aconnect_driver = {
106106
.probe = tegra_aconnect_probe,
107-
.remove_new = tegra_aconnect_remove,
107+
.remove = tegra_aconnect_remove,
108108
.driver = {
109109
.name = "tegra-aconnect",
110110
.of_match_table = tegra_aconnect_of_match,

drivers/bus/tegra-gmi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ MODULE_DEVICE_TABLE(of, tegra_gmi_id_table);
303303

304304
static struct platform_driver tegra_gmi_driver = {
305305
.probe = tegra_gmi_probe,
306-
.remove_new = tegra_gmi_remove,
306+
.remove = tegra_gmi_remove,
307307
.driver = {
308308
.name = "tegra-gmi",
309309
.of_match_table = tegra_gmi_id_table,

0 commit comments

Comments
 (0)