mirror of
https://github.com/torvalds/linux.git
synced 2024-11-21 19:41:42 +00:00
chrome platform changes for 6.13
* Fixes - Fix a leak of fwnode refcount. * Cleanups - Drop unused I2C driver data. - Move back from platform_driver::remove_new() to platform_driver::remove(). -----BEGIN PGP SIGNATURE----- iIkEABYIADEWIQS0yQeDP3cjLyifNRUrxTEGBto89AUCZzqB9xMcdHp1bmdiaUBr ZXJuZWwub3JnAAoJECvFMQYG2jz0UawA/Ran3vo2ZW2QWidUXC3UysdAfrRUPVE1 pGxjN3sMC1FDAQDugrMciHDY/8fkY/vofGuQ8ctgL34m6qaWUuv3HnDnDw== =8C9s -----END PGP SIGNATURE----- Merge tag 'chrome-platform-for-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux Pull chrome platform updates from Tzung-Bi Shih: "Fixes: - Fix a leak of fwnode refcount. Cleanups: - Drop unused I2C driver data - Move back from platform_driver::remove_new() to platform_driver::remove()" * tag 'chrome-platform-for-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux: platform/chrome: Switch back to struct platform_driver::remove() platform/chrome: cros_ec_typec: fix missing fwnode reference decrement platform/chrome: Drop explicit initialization of struct i2c_device_id::driver_data to 0
This commit is contained in:
commit
78516f4aef
@ -415,7 +415,7 @@ static struct platform_driver cros_ec_chardev_driver = {
|
||||
.name = DRV_NAME,
|
||||
},
|
||||
.probe = cros_ec_chardev_probe,
|
||||
.remove_new = cros_ec_chardev_remove,
|
||||
.remove = cros_ec_chardev_remove,
|
||||
.id_table = cros_ec_chardev_id,
|
||||
};
|
||||
|
||||
|
@ -582,7 +582,7 @@ static struct platform_driver cros_ec_debugfs_driver = {
|
||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
},
|
||||
.probe = cros_ec_debugfs_probe,
|
||||
.remove_new = cros_ec_debugfs_remove,
|
||||
.remove = cros_ec_debugfs_remove,
|
||||
.id_table = cros_ec_debugfs_id,
|
||||
};
|
||||
|
||||
|
@ -352,7 +352,7 @@ MODULE_DEVICE_TABLE(of, cros_ec_i2c_of_match);
|
||||
#endif
|
||||
|
||||
static const struct i2c_device_id cros_ec_i2c_id[] = {
|
||||
{ "cros-ec-i2c", 0 },
|
||||
{ "cros-ec-i2c" },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, cros_ec_i2c_id);
|
||||
|
@ -608,7 +608,7 @@ static struct platform_driver cros_ec_lightbar_driver = {
|
||||
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
},
|
||||
.probe = cros_ec_lightbar_probe,
|
||||
.remove_new = cros_ec_lightbar_remove,
|
||||
.remove = cros_ec_lightbar_remove,
|
||||
.id_table = cros_ec_lightbar_id,
|
||||
};
|
||||
|
||||
|
@ -783,7 +783,7 @@ static struct platform_driver cros_ec_lpc_driver = {
|
||||
.probe_type = PROBE_FORCE_SYNCHRONOUS,
|
||||
},
|
||||
.probe = cros_ec_lpc_probe,
|
||||
.remove_new = cros_ec_lpc_remove,
|
||||
.remove = cros_ec_lpc_remove,
|
||||
};
|
||||
|
||||
static struct platform_device cros_ec_lpc_device = {
|
||||
|
@ -359,7 +359,7 @@ static struct platform_driver cros_ec_sysfs_driver = {
|
||||
.name = DRV_NAME,
|
||||
},
|
||||
.probe = cros_ec_sysfs_probe,
|
||||
.remove_new = cros_ec_sysfs_remove,
|
||||
.remove = cros_ec_sysfs_remove,
|
||||
.id_table = cros_ec_sysfs_id,
|
||||
};
|
||||
|
||||
|
@ -409,6 +409,7 @@ static int cros_typec_init_ports(struct cros_typec_data *typec)
|
||||
return 0;
|
||||
|
||||
unregister_ports:
|
||||
fwnode_handle_put(fwnode);
|
||||
cros_unregister_ports(typec);
|
||||
return ret;
|
||||
}
|
||||
@ -1325,7 +1326,7 @@ static struct platform_driver cros_typec_driver = {
|
||||
.pm = &cros_typec_pm_ops,
|
||||
},
|
||||
.probe = cros_typec_probe,
|
||||
.remove_new = cros_typec_remove,
|
||||
.remove = cros_typec_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(cros_typec_driver);
|
||||
|
@ -145,7 +145,7 @@ static struct platform_driver cros_ec_vbc_driver = {
|
||||
.name = DRV_NAME,
|
||||
},
|
||||
.probe = cros_ec_vbc_probe,
|
||||
.remove_new = cros_ec_vbc_remove,
|
||||
.remove = cros_ec_vbc_remove,
|
||||
.id_table = cros_ec_vbc_id,
|
||||
};
|
||||
|
||||
|
@ -129,7 +129,7 @@ static int hps_resume(struct device *dev)
|
||||
static DEFINE_RUNTIME_DEV_PM_OPS(hps_pm_ops, hps_suspend, hps_resume, NULL);
|
||||
|
||||
static const struct i2c_device_id hps_i2c_id[] = {
|
||||
{ "cros-hps", 0 },
|
||||
{ "cros-hps" },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, hps_i2c_id);
|
||||
|
@ -318,7 +318,7 @@ static struct platform_driver cros_typec_switch_driver = {
|
||||
.acpi_match_table = ACPI_PTR(cros_typec_switch_acpi_id),
|
||||
},
|
||||
.probe = cros_typec_switch_probe,
|
||||
.remove_new = cros_typec_switch_remove,
|
||||
.remove = cros_typec_switch_remove,
|
||||
};
|
||||
|
||||
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,
|
||||
},
|
||||
.probe = cros_usbpd_logger_probe,
|
||||
.remove_new = cros_usbpd_logger_remove,
|
||||
.remove = cros_usbpd_logger_remove,
|
||||
.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,
|
||||
},
|
||||
.probe = cros_usbpd_notify_probe_acpi,
|
||||
.remove_new = cros_usbpd_notify_remove_acpi,
|
||||
.remove = cros_usbpd_notify_remove_acpi,
|
||||
};
|
||||
|
||||
#endif /* CONFIG_ACPI */
|
||||
@ -230,7 +230,7 @@ static struct platform_driver cros_usbpd_notify_plat_driver = {
|
||||
.name = DRV_NAME,
|
||||
},
|
||||
.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,
|
||||
};
|
||||
|
||||
|
@ -163,7 +163,7 @@ static struct platform_driver wilco_ec_driver = {
|
||||
.acpi_match_table = wilco_ec_acpi_device_ids,
|
||||
},
|
||||
.probe = wilco_ec_probe,
|
||||
.remove_new = wilco_ec_remove,
|
||||
.remove = wilco_ec_remove,
|
||||
.id_table = wilco_ec_id,
|
||||
};
|
||||
|
||||
|
@ -276,7 +276,7 @@ static struct platform_driver wilco_ec_debugfs_driver = {
|
||||
.name = DRV_NAME,
|
||||
},
|
||||
.probe = wilco_ec_debugfs_probe,
|
||||
.remove_new = wilco_ec_debugfs_remove,
|
||||
.remove = wilco_ec_debugfs_remove,
|
||||
.id_table = wilco_ec_debugfs_id,
|
||||
};
|
||||
|
||||
|
@ -417,7 +417,7 @@ MODULE_DEVICE_TABLE(platform, telem_id);
|
||||
|
||||
static struct platform_driver telem_driver = {
|
||||
.probe = telem_device_probe,
|
||||
.remove_new = telem_device_remove,
|
||||
.remove = telem_device_remove,
|
||||
.driver = {
|
||||
.name = DRV_NAME,
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user