mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-12-29 17:25:38 +00:00
platform/chrome: Switch back to struct platform_driver::remove()
After commit 0edb555a65
("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 <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/20241028082611.431723-2-u.kleine-koenig@baylibre.com
Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>
This commit is contained in:
parent
9c41f37145
commit
ea45f3f467
@ -415,7 +415,7 @@ static struct platform_driver cros_ec_chardev_driver = {
|
|||||||
.name = DRV_NAME,
|
.name = DRV_NAME,
|
||||||
},
|
},
|
||||||
.probe = cros_ec_chardev_probe,
|
.probe = cros_ec_chardev_probe,
|
||||||
.remove_new = cros_ec_chardev_remove,
|
.remove = cros_ec_chardev_remove,
|
||||||
.id_table = cros_ec_chardev_id,
|
.id_table = cros_ec_chardev_id,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -582,7 +582,7 @@ static struct platform_driver cros_ec_debugfs_driver = {
|
|||||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||||
},
|
},
|
||||||
.probe = cros_ec_debugfs_probe,
|
.probe = cros_ec_debugfs_probe,
|
||||||
.remove_new = cros_ec_debugfs_remove,
|
.remove = cros_ec_debugfs_remove,
|
||||||
.id_table = cros_ec_debugfs_id,
|
.id_table = cros_ec_debugfs_id,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -608,7 +608,7 @@ static struct platform_driver cros_ec_lightbar_driver = {
|
|||||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||||
},
|
},
|
||||||
.probe = cros_ec_lightbar_probe,
|
.probe = cros_ec_lightbar_probe,
|
||||||
.remove_new = cros_ec_lightbar_remove,
|
.remove = cros_ec_lightbar_remove,
|
||||||
.id_table = cros_ec_lightbar_id,
|
.id_table = cros_ec_lightbar_id,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -783,7 +783,7 @@ static struct platform_driver cros_ec_lpc_driver = {
|
|||||||
.probe_type = PROBE_FORCE_SYNCHRONOUS,
|
.probe_type = PROBE_FORCE_SYNCHRONOUS,
|
||||||
},
|
},
|
||||||
.probe = cros_ec_lpc_probe,
|
.probe = cros_ec_lpc_probe,
|
||||||
.remove_new = cros_ec_lpc_remove,
|
.remove = cros_ec_lpc_remove,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_device cros_ec_lpc_device = {
|
static struct platform_device cros_ec_lpc_device = {
|
||||||
|
@ -359,7 +359,7 @@ static struct platform_driver cros_ec_sysfs_driver = {
|
|||||||
.name = DRV_NAME,
|
.name = DRV_NAME,
|
||||||
},
|
},
|
||||||
.probe = cros_ec_sysfs_probe,
|
.probe = cros_ec_sysfs_probe,
|
||||||
.remove_new = cros_ec_sysfs_remove,
|
.remove = cros_ec_sysfs_remove,
|
||||||
.id_table = cros_ec_sysfs_id,
|
.id_table = cros_ec_sysfs_id,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1326,7 +1326,7 @@ static struct platform_driver cros_typec_driver = {
|
|||||||
.pm = &cros_typec_pm_ops,
|
.pm = &cros_typec_pm_ops,
|
||||||
},
|
},
|
||||||
.probe = cros_typec_probe,
|
.probe = cros_typec_probe,
|
||||||
.remove_new = cros_typec_remove,
|
.remove = cros_typec_remove,
|
||||||
};
|
};
|
||||||
|
|
||||||
module_platform_driver(cros_typec_driver);
|
module_platform_driver(cros_typec_driver);
|
||||||
|
@ -145,7 +145,7 @@ static struct platform_driver cros_ec_vbc_driver = {
|
|||||||
.name = DRV_NAME,
|
.name = DRV_NAME,
|
||||||
},
|
},
|
||||||
.probe = cros_ec_vbc_probe,
|
.probe = cros_ec_vbc_probe,
|
||||||
.remove_new = cros_ec_vbc_remove,
|
.remove = cros_ec_vbc_remove,
|
||||||
.id_table = cros_ec_vbc_id,
|
.id_table = cros_ec_vbc_id,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -318,7 +318,7 @@ static struct platform_driver cros_typec_switch_driver = {
|
|||||||
.acpi_match_table = ACPI_PTR(cros_typec_switch_acpi_id),
|
.acpi_match_table = ACPI_PTR(cros_typec_switch_acpi_id),
|
||||||
},
|
},
|
||||||
.probe = cros_typec_switch_probe,
|
.probe = cros_typec_switch_probe,
|
||||||
.remove_new = cros_typec_switch_remove,
|
.remove = cros_typec_switch_remove,
|
||||||
};
|
};
|
||||||
|
|
||||||
module_platform_driver(cros_typec_switch_driver);
|
module_platform_driver(cros_typec_switch_driver);
|
||||||
|
@ -262,7 +262,7 @@ static struct platform_driver cros_usbpd_logger_driver = {
|
|||||||
.pm = &cros_usbpd_logger_pm_ops,
|
.pm = &cros_usbpd_logger_pm_ops,
|
||||||
},
|
},
|
||||||
.probe = cros_usbpd_logger_probe,
|
.probe = cros_usbpd_logger_probe,
|
||||||
.remove_new = cros_usbpd_logger_remove,
|
.remove = cros_usbpd_logger_remove,
|
||||||
.id_table = cros_usbpd_logger_id,
|
.id_table = cros_usbpd_logger_id,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -156,7 +156,7 @@ static struct platform_driver cros_usbpd_notify_acpi_driver = {
|
|||||||
.acpi_match_table = cros_usbpd_notify_acpi_device_ids,
|
.acpi_match_table = cros_usbpd_notify_acpi_device_ids,
|
||||||
},
|
},
|
||||||
.probe = cros_usbpd_notify_probe_acpi,
|
.probe = cros_usbpd_notify_probe_acpi,
|
||||||
.remove_new = cros_usbpd_notify_remove_acpi,
|
.remove = cros_usbpd_notify_remove_acpi,
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* CONFIG_ACPI */
|
#endif /* CONFIG_ACPI */
|
||||||
@ -230,7 +230,7 @@ static struct platform_driver cros_usbpd_notify_plat_driver = {
|
|||||||
.name = DRV_NAME,
|
.name = DRV_NAME,
|
||||||
},
|
},
|
||||||
.probe = cros_usbpd_notify_probe_plat,
|
.probe = cros_usbpd_notify_probe_plat,
|
||||||
.remove_new = cros_usbpd_notify_remove_plat,
|
.remove = cros_usbpd_notify_remove_plat,
|
||||||
.id_table = cros_usbpd_notify_id,
|
.id_table = cros_usbpd_notify_id,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -163,7 +163,7 @@ static struct platform_driver wilco_ec_driver = {
|
|||||||
.acpi_match_table = wilco_ec_acpi_device_ids,
|
.acpi_match_table = wilco_ec_acpi_device_ids,
|
||||||
},
|
},
|
||||||
.probe = wilco_ec_probe,
|
.probe = wilco_ec_probe,
|
||||||
.remove_new = wilco_ec_remove,
|
.remove = wilco_ec_remove,
|
||||||
.id_table = wilco_ec_id,
|
.id_table = wilco_ec_id,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -276,7 +276,7 @@ static struct platform_driver wilco_ec_debugfs_driver = {
|
|||||||
.name = DRV_NAME,
|
.name = DRV_NAME,
|
||||||
},
|
},
|
||||||
.probe = wilco_ec_debugfs_probe,
|
.probe = wilco_ec_debugfs_probe,
|
||||||
.remove_new = wilco_ec_debugfs_remove,
|
.remove = wilco_ec_debugfs_remove,
|
||||||
.id_table = wilco_ec_debugfs_id,
|
.id_table = wilco_ec_debugfs_id,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -417,7 +417,7 @@ MODULE_DEVICE_TABLE(platform, telem_id);
|
|||||||
|
|
||||||
static struct platform_driver telem_driver = {
|
static struct platform_driver telem_driver = {
|
||||||
.probe = telem_device_probe,
|
.probe = telem_device_probe,
|
||||||
.remove_new = telem_device_remove,
|
.remove = telem_device_remove,
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = DRV_NAME,
|
.name = DRV_NAME,
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user