Commit 78516f4a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'chrome-platform-for-6.13' of... 

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
parents 311e062a ea45f3f4

drivers/platform/chrome/cros_ec_chardev.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};

drivers/platform/chrome/cros_ec_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};

drivers/platform/chrome/cros_ec_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/platform/chrome/cros_ec_lightbar.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};

drivers/platform/chrome/cros_ec_lpc.c

+1 −1
Original line number Diff line number Diff line
@@ -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 = {