Skip to content

Commit 78516f4

Browse files
committed
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
2 parents 311e062 + ea45f3f commit 78516f4

15 files changed

+17
-16
lines changed

drivers/platform/chrome/cros_ec_chardev.c

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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_i2c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ MODULE_DEVICE_TABLE(of, cros_ec_i2c_of_match);
352352
#endif
353353

354354
static const struct i2c_device_id cros_ec_i2c_id[] = {
355-
{ "cros-ec-i2c", 0 },
355+
{ "cros-ec-i2c" },
356356
{ }
357357
};
358358
MODULE_DEVICE_TABLE(i2c, cros_ec_i2c_id);

drivers/platform/chrome/cros_ec_lightbar.c

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,7 @@ static int cros_typec_init_ports(struct cros_typec_data *typec)
409409
return 0;
410410

411411
unregister_ports:
412+
fwnode_handle_put(fwnode);
412413
cros_unregister_ports(typec);
413414
return ret;
414415
}
@@ -1325,7 +1326,7 @@ static struct platform_driver cros_typec_driver = {
13251326
.pm = &cros_typec_pm_ops,
13261327
},
13271328
.probe = cros_typec_probe,
1328-
.remove_new = cros_typec_remove,
1329+
.remove = cros_typec_remove,
13291330
};
13301331

13311332
module_platform_driver(cros_typec_driver);

drivers/platform/chrome/cros_ec_vbc.c

Lines changed: 1 addition & 1 deletion
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_hps_i2c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ static int hps_resume(struct device *dev)
129129
static DEFINE_RUNTIME_DEV_PM_OPS(hps_pm_ops, hps_suspend, hps_resume, NULL);
130130

131131
static const struct i2c_device_id hps_i2c_id[] = {
132-
{ "cros-hps", 0 },
132+
{ "cros-hps" },
133133
{ }
134134
};
135135
MODULE_DEVICE_TABLE(i2c, hps_i2c_id);

drivers/platform/chrome/cros_typec_switch.c

Lines changed: 1 addition & 1 deletion
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);

0 commit comments

Comments
 (0)