Skip to content

Commit ea45f3f

Browse files
ukleinekTzung-Bi Shih
authored and
Tzung-Bi Shih
committed
platform/chrome: 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/platform/chrome 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: Tzung-Bi Shih <[email protected]>
1 parent 9c41f37 commit ea45f3f

13 files changed

+14
-14
lines changed

drivers/platform/chrome/cros_ec_chardev.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ static struct platform_driver cros_ec_chardev_driver = {
415415
.name = DRV_NAME,
416416
},
417417
.probe = cros_ec_chardev_probe,
418-
.remove_new = cros_ec_chardev_remove,
418+
.remove = cros_ec_chardev_remove,
419419
.id_table = cros_ec_chardev_id,
420420
};
421421

drivers/platform/chrome/cros_ec_debugfs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ static struct platform_driver cros_ec_debugfs_driver = {
582582
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
583583
},
584584
.probe = cros_ec_debugfs_probe,
585-
.remove_new = cros_ec_debugfs_remove,
585+
.remove = cros_ec_debugfs_remove,
586586
.id_table = cros_ec_debugfs_id,
587587
};
588588

drivers/platform/chrome/cros_ec_lightbar.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ static struct platform_driver cros_ec_lightbar_driver = {
608608
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
609609
},
610610
.probe = cros_ec_lightbar_probe,
611-
.remove_new = cros_ec_lightbar_remove,
611+
.remove = cros_ec_lightbar_remove,
612612
.id_table = cros_ec_lightbar_id,
613613
};
614614

drivers/platform/chrome/cros_ec_lpc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ static struct platform_driver cros_ec_lpc_driver = {
783783
.probe_type = PROBE_FORCE_SYNCHRONOUS,
784784
},
785785
.probe = cros_ec_lpc_probe,
786-
.remove_new = cros_ec_lpc_remove,
786+
.remove = cros_ec_lpc_remove,
787787
};
788788

789789
static struct platform_device cros_ec_lpc_device = {

drivers/platform/chrome/cros_ec_sysfs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ static struct platform_driver cros_ec_sysfs_driver = {
359359
.name = DRV_NAME,
360360
},
361361
.probe = cros_ec_sysfs_probe,
362-
.remove_new = cros_ec_sysfs_remove,
362+
.remove = cros_ec_sysfs_remove,
363363
.id_table = cros_ec_sysfs_id,
364364
};
365365

drivers/platform/chrome/cros_ec_typec.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1326,7 +1326,7 @@ static struct platform_driver cros_typec_driver = {
13261326
.pm = &cros_typec_pm_ops,
13271327
},
13281328
.probe = cros_typec_probe,
1329-
.remove_new = cros_typec_remove,
1329+
.remove = cros_typec_remove,
13301330
};
13311331

13321332
module_platform_driver(cros_typec_driver);

drivers/platform/chrome/cros_ec_vbc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ static struct platform_driver cros_ec_vbc_driver = {
145145
.name = DRV_NAME,
146146
},
147147
.probe = cros_ec_vbc_probe,
148-
.remove_new = cros_ec_vbc_remove,
148+
.remove = cros_ec_vbc_remove,
149149
.id_table = cros_ec_vbc_id,
150150
};
151151

drivers/platform/chrome/cros_typec_switch.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ static struct platform_driver cros_typec_switch_driver = {
318318
.acpi_match_table = ACPI_PTR(cros_typec_switch_acpi_id),
319319
},
320320
.probe = cros_typec_switch_probe,
321-
.remove_new = cros_typec_switch_remove,
321+
.remove = cros_typec_switch_remove,
322322
};
323323

324324
module_platform_driver(cros_typec_switch_driver);

drivers/platform/chrome/cros_usbpd_logger.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ static struct platform_driver cros_usbpd_logger_driver = {
262262
.pm = &cros_usbpd_logger_pm_ops,
263263
},
264264
.probe = cros_usbpd_logger_probe,
265-
.remove_new = cros_usbpd_logger_remove,
265+
.remove = cros_usbpd_logger_remove,
266266
.id_table = cros_usbpd_logger_id,
267267
};
268268

drivers/platform/chrome/cros_usbpd_notify.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ static struct platform_driver cros_usbpd_notify_acpi_driver = {
156156
.acpi_match_table = cros_usbpd_notify_acpi_device_ids,
157157
},
158158
.probe = cros_usbpd_notify_probe_acpi,
159-
.remove_new = cros_usbpd_notify_remove_acpi,
159+
.remove = cros_usbpd_notify_remove_acpi,
160160
};
161161

162162
#endif /* CONFIG_ACPI */
@@ -230,7 +230,7 @@ static struct platform_driver cros_usbpd_notify_plat_driver = {
230230
.name = DRV_NAME,
231231
},
232232
.probe = cros_usbpd_notify_probe_plat,
233-
.remove_new = cros_usbpd_notify_remove_plat,
233+
.remove = cros_usbpd_notify_remove_plat,
234234
.id_table = cros_usbpd_notify_id,
235235
};
236236

drivers/platform/chrome/wilco_ec/core.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ static struct platform_driver wilco_ec_driver = {
163163
.acpi_match_table = wilco_ec_acpi_device_ids,
164164
},
165165
.probe = wilco_ec_probe,
166-
.remove_new = wilco_ec_remove,
166+
.remove = wilco_ec_remove,
167167
.id_table = wilco_ec_id,
168168
};
169169

drivers/platform/chrome/wilco_ec/debugfs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ static struct platform_driver wilco_ec_debugfs_driver = {
276276
.name = DRV_NAME,
277277
},
278278
.probe = wilco_ec_debugfs_probe,
279-
.remove_new = wilco_ec_debugfs_remove,
279+
.remove = wilco_ec_debugfs_remove,
280280
.id_table = wilco_ec_debugfs_id,
281281
};
282282

drivers/platform/chrome/wilco_ec/telemetry.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ MODULE_DEVICE_TABLE(platform, telem_id);
417417

418418
static struct platform_driver telem_driver = {
419419
.probe = telem_device_probe,
420-
.remove_new = telem_device_remove,
420+
.remove = telem_device_remove,
421421
.driver = {
422422
.name = DRV_NAME,
423423
},

0 commit comments

Comments
 (0)