Commit 5852f2af authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Dmitry Torokhov
Browse files

Input: drop explicit initialization of struct i2c_device_id::driver_data to 0 



These drivers don't use the driver_data member of struct i2c_device_id,
so don't explicitly initialize this member.

This prepares putting driver_data in an anonymous union which requires
either no initialization or named designators. But it's also a nice
cleanup on its own.

While add it, also remove commas after the sentinel entries.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20240509174158.2211071-2-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent adb2e48a

drivers/input/joystick/as5011.c

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static void as5011_remove(struct i2c_client *client) 
}



static const struct i2c_device_id as5011_id[] = {

	{ MODULE_DEVICE_ALIAS, 0 },

	{ MODULE_DEVICE_ALIAS },

	{ }

};

MODULE_DEVICE_TABLE(i2c, as5011_id);

drivers/input/joystick/qwiic-joystick.c

+2 −2
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ MODULE_DEVICE_TABLE(of, of_qwiic_match); 
#endif /* CONFIG_OF */



static const struct i2c_device_id qwiic_id_table[] = {

	{ KBUILD_MODNAME, 0 },

	{ },

	{ KBUILD_MODNAME },

	{ }

};

MODULE_DEVICE_TABLE(i2c, qwiic_id_table);

drivers/input/keyboard/adp5588-keys.c

+2 −2
Original line number Diff line number Diff line
@@ -832,8 +832,8 @@ static int adp5588_resume(struct device *dev) 
static DEFINE_SIMPLE_DEV_PM_OPS(adp5588_dev_pm_ops, adp5588_suspend, adp5588_resume);



static const struct i2c_device_id adp5588_id[] = {

	{ "adp5588-keys", 0 },

	{ "adp5587-keys", 0 },

	{ "adp5588-keys" },

	{ "adp5587-keys" },

	{ }

};

MODULE_DEVICE_TABLE(i2c, adp5588_id);

drivers/input/keyboard/cypress-sf.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(cypress_sf_pm_ops, 
				cypress_sf_suspend, cypress_sf_resume);



static struct i2c_device_id cypress_sf_id_table[] = {

	{ CYPRESS_SF_DEV_NAME, 0 },

	{ CYPRESS_SF_DEV_NAME },

	{ }

};

MODULE_DEVICE_TABLE(i2c, cypress_sf_id_table);

drivers/input/keyboard/dlink-dir685-touchkeys.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static int dir685_tk_probe(struct i2c_client *client) 
}



static const struct i2c_device_id dir685_tk_id[] = {

	{ "dir685tk", 0 },

	{ "dir685tk" },

	{ }

};

MODULE_DEVICE_TABLE(i2c, dir685_tk_id);