Input - Drop explicit initialization of struct i2c_device_id::driver_data to 0
Subsystems (14)
PATCH 1/1 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 Uwe Kleine-König <[email protected]>
--- drivers/input/joystick/as5011.c | 2 +- drivers/input/joystick/qwiic-joystick.c | 4 ++-- drivers/input/keyboard/adp5588-keys.c | 4 ++-- drivers/input/keyboard/cypress-sf.c | 2 +- drivers/input/keyboard/dlink-dir685-touchkeys.c | 2 +- drivers/input/keyboard/lm8323.c | 2 +- drivers/input/keyboard/lm8333.c | 2 +- drivers/input/keyboard/max7359_keypad.c | 2 +- drivers/input/keyboard/mpr121_touchkey.c | 2 +- drivers/input/keyboard/qt1070.c | 4 ++-- drivers/input/keyboard/qt2160.c | 2 +- drivers/input/keyboard/tm2-touchkey.c | 4 ++-- drivers/input/misc/ad714x-i2c.c | 10 +++++----- drivers/input/misc/adxl34x-i2c.c | 2 +- drivers/input/misc/apanel.c | 2 +- drivers/input/misc/atmel_captouch.c | 2 +- drivers/input/misc/bma150.c | 6 +++--- drivers/input/misc/cma3000_d0x_i2c.c | 4 ++-- drivers/input/misc/drv260x.c | 2 +- drivers/input/misc/drv2665.c | 2 +- drivers/input/misc/drv2667.c | 2 +- drivers/input/misc/kxtj9.c | 4 ++-- drivers/input/misc/mma8450.c | 4 ++-- drivers/input/misc/pcf8574_keypad.c | 2 +- drivers/input/mouse/cyapa.c | 4 ++-- drivers/input/mouse/elan_i2c_core.c | 4 ++-- drivers/input/mouse/synaptics_i2c.c | 4 ++-- drivers/input/rmi4/rmi_i2c.c | 2 +- drivers/input/rmi4/rmi_smbus.c | 2 +- drivers/input/touchscreen/ad7879-i2c.c | 4 ++-- drivers/input/touchscreen/ar1021_i2c.c | 4 ++-- drivers/input/touchscreen/atmel_mxt_ts.c | 10 +++++----- drivers/input/touchscreen/auo-pixcir-ts.c | 2 +- drivers/input/touchscreen/bu21013_ts.c | 2 +- drivers/input/touchscreen/bu21029_ts.c | 2 +- drivers/input/touchscreen/cy8ctma140.c | 2 +- drivers/input/touchscreen/cyttsp4_i2c.c | 2 +- drivers/input/touchscreen/cyttsp5.c | 2 +- drivers/input/touchscreen/cyttsp_i2c.c | 2 +- drivers/input/touchscreen/eeti_ts.c | 2 +- drivers/input/touchscreen/egalax_ts.c | 2 +- drivers/input/touchscreen/ektf2127.c | 4 ++-- drivers/input/touchscreen/goodix.c | 2 +- drivers/input/touchscreen/goodix_berlin_i2c.c | 2 +- drivers/input/touchscreen/hideep.c | 2 +- drivers/input/touchscreen/himax_hx83112b.c | 2 +- drivers/input/touchscreen/ilitek_ts_i2c.c | 4 ++-- drivers/input/touchscreen/max11801_ts.c | 2 +- drivers/input/touchscreen/mcs5000_ts.c | 2 +- drivers/input/touchscreen/melfas_mip4.c | 4 ++-- drivers/input/touchscreen/migor_ts.c | 2 +- drivers/input/touchscreen/mms114.c | 2 +- drivers/input/touchscreen/raydium_i2c_ts.c | 4 ++-- drivers/input/touchscreen/rohm_bu21023.c | 2 +- drivers/input/touchscreen/s6sy761.c | 4 ++-- drivers/input/touchscreen/silead.c | 12 ++++++------ drivers/input/touchscreen/sis_i2c.c | 4 ++-- drivers/input/touchscreen/stmfts.c | 4 ++-- drivers/input/touchscreen/tsc2004.c | 2 +- drivers/input/touchscreen/tsc2007_core.c | 2 +- drivers/input/touchscreen/wacom_i2c.c | 4 ++-- drivers/input/touchscreen/wdt87xx_i2c.c | 2 +- drivers/input/touchscreen/zet6223.c | 2 +- drivers/input/touchscreen/zforce_ts.c | 2 +- 64 files changed, 99 insertions(+), 99 deletions(-)
drivers/input/joystick/as5011.c +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
drivers/input/keyboard/lm8323.c +1 -1
@@ -792,7 +792,7 @@ static int lm8323_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(lm8323_pm_ops, lm8323_suspend, lm8323_resume);static const struct i2c_device_id lm8323_id[] = { - {"lm8323" ,0 }, + {"lm8323" }, { } };
drivers/input/keyboard/lm8333.c +1 -1
@@ -194,7 +194,7 @@ static int lm8333_probe(struct i2c_client *client) }static const struct i2c_device_id lm8333_id[] = { - {"lm8333" ,0 }, + {"lm8333" }, { } };MODULE_DEVICE_TABLE (i2c, lm8333_id);
drivers/input/keyboard/max7359_keypad.c +1 -1
@@ -270,7 +270,7 @@ static int max7359_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(max7359_pm, max7359_suspend, max7359_resume);static const struct i2c_device_id max7359_ids[] = { - {"max7359" ,0 }, + {"max7359" }, { } };MODULE_DEVICE_TABLE (i2c, max7359_ids);
drivers/input/keyboard/mpr121_touchkey.c +1 -1
@@ -369,7 +369,7 @@ static int mpr_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(mpr121_touchkey_pm_ops, mpr_suspend, mpr_resume);static const struct i2c_device_id mpr121_id[] = { - {"mpr121_touchkey" ,0 }, + {"mpr121_touchkey" }, { } };MODULE_DEVICE_TABLE (i2c, mpr121_id);
drivers/input/keyboard/qt1070.c +2 -2
@@ -234,8 +234,8 @@ static int qt1070_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(qt1070_pm_ops, qt1070_suspend, qt1070_resume);static const struct i2c_device_id qt1070_id[] = { - {"qt1070" ,0 }, - { }, + {"qt1070" }, + { } };MODULE_DEVICE_TABLE (i2c, qt1070_id);
drivers/input/keyboard/qt2160.c +1 -1
@@ -393,7 +393,7 @@ static int qt2160_probe(struct i2c_client *client) }static const struct i2c_device_id qt2160_idtable[] = { - {"qt2160" ,0 , }, + {"qt2160" }, { } };
drivers/input/keyboard/tm2-touchkey.c +2 -2
@@ -326,8 +326,8 @@ static DEFINE_SIMPLE_DEV_PM_OPS(tm2_touchkey_pm_ops, tm2_touchkey_suspend, tm2_touchkey_resume);static const struct i2c_device_id tm2_touchkey_id_table[] = { - {TM2_TOUCHKEY_DEV_NAME ,0 }, - { }, + {TM2_TOUCHKEY_DEV_NAME }, + { } };MODULE_DEVICE_TABLE (i2c, tm2_touchkey_id_table);
drivers/input/misc/ad714x-i2c.c +5 -5
@@ -72,11 +72,11 @@ static int ad714x_i2c_probe(struct i2c_client *client) }static const struct i2c_device_id ad714x_id[] = { - {"ad7142_captouch" ,0 }, - {"ad7143_captouch" ,0 }, - {"ad7147_captouch" ,0 }, - {"ad7147a_captouch" ,0 }, - {"ad7148_captouch" ,0 }, + {"ad7142_captouch" }, + {"ad7143_captouch" }, + {"ad7147_captouch" }, + {"ad7147a_captouch" }, + {"ad7148_captouch" }, { } };MODULE_DEVICE_TABLE (i2c, ad714x_id);
drivers/input/misc/adxl34x-i2c.c +1 -1
@@ -106,7 +106,7 @@ static void adxl34x_i2c_remove(struct i2c_client *client) }static const struct i2c_device_id adxl34x_id[] = { - {"adxl34x" ,0 }, + {"adxl34x" }, { } };
drivers/input/misc/apanel.c +1 -1
@@ -192,7 +192,7 @@ static void apanel_shutdown(struct i2c_client *client) }static const struct i2c_device_id apanel_id[] = { - {"fujitsu_apanel" ,0 }, + {"fujitsu_apanel" }, { } };MODULE_DEVICE_TABLE (i2c, apanel_id);
drivers/input/misc/atmel_captouch.c +1 -1
@@ -257,7 +257,7 @@ static const struct of_device_id atmel_captouch_of_id[] = {MODULE_DEVICE_TABLE (of, atmel_captouch_of_id);static const struct i2c_device_id atmel_captouch_id[] = { - {"atmel_captouch" ,0 }, + {"atmel_captouch" }, { } };MODULE_DEVICE_TABLE (i2c, atmel_captouch_id);
drivers/input/misc/bma150.c +3 -3
@@ -536,9 +536,9 @@ static int __maybe_unused bma150_resume(struct device *dev) static UNIVERSAL_DEV_PM_OPS(bma150_pm, bma150_suspend, bma150_resume, NULL);static const struct i2c_device_id bma150_id[] = { - {"bma150" ,0 }, - {"smb380" ,0 }, - {"bma023" ,0 }, + {"bma150" }, + {"smb380" }, + {"bma023" }, { } };
drivers/input/misc/cma3000_d0x_i2c.c +2 -2
@@ -90,8 +90,8 @@ static const struct dev_pm_ops cma3000_i2c_pm_ops = { };static const struct i2c_device_id cma3000_i2c_id[] = { - {"cma3000_d01" ,0 }, - { }, + {"cma3000_d01" }, + { } };MODULE_DEVICE_TABLE (i2c, cma3000_i2c_id);
drivers/input/misc/drv260x.c +1 -1
@@ -600,7 +600,7 @@ static int drv260x_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(drv260x_pm_ops, drv260x_suspend, drv260x_resume);static const struct i2c_device_id drv260x_id[] = { - {"drv2605l" ,0 }, + {"drv2605l" }, { } };MODULE_DEVICE_TABLE (i2c, drv260x_id);
drivers/input/misc/drv2665.c +1 -1
@@ -283,7 +283,7 @@ static int drv2665_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(drv2665_pm_ops, drv2665_suspend, drv2665_resume);static const struct i2c_device_id drv2665_id[] = { - {"drv2665" ,0 }, + {"drv2665" }, { } };MODULE_DEVICE_TABLE (i2c, drv2665_id);
drivers/input/misc/drv2667.c +1 -1
@@ -460,7 +460,7 @@ static int drv2667_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(drv2667_pm_ops, drv2667_suspend, drv2667_resume);static const struct i2c_device_id drv2667_id[] = { - {"drv2667" ,0 }, + {"drv2667" }, { } };MODULE_DEVICE_TABLE (i2c, drv2667_id);
drivers/input/misc/kxtj9.c +2 -2
@@ -531,8 +531,8 @@ static int kxtj9_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(kxtj9_pm_ops, kxtj9_suspend, kxtj9_resume);static const struct i2c_device_id kxtj9_id[] = { - {NAME ,0 }, - { }, + {NAME }, + { } };MODULE_DEVICE_TABLE (i2c, kxtj9_id);
drivers/input/misc/mma8450.c +2 -2
@@ -186,8 +186,8 @@ static int mma8450_probe(struct i2c_client *c) }static const struct i2c_device_id mma8450_id[] = { - {MMA8450_DRV_NAME ,0 }, - { }, + {MMA8450_DRV_NAME }, + { } };MODULE_DEVICE_TABLE (i2c, mma8450_id);
drivers/input/misc/pcf8574_keypad.c +1 -1
@@ -189,7 +189,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(pcf8574_kp_pm_ops, pcf8574_kp_suspend, pcf8574_kp_resume);static const struct i2c_device_id pcf8574_kp_id[] = { - {DRV_NAME ,0 }, + {DRV_NAME }, { } };MODULE_DEVICE_TABLE (i2c, pcf8574_kp_id);
drivers/input/mouse/cyapa.c +2 -2
@@ -1459,8 +1459,8 @@ static const struct dev_pm_ops cyapa_pm_ops = { };static const struct i2c_device_id cyapa_id_table[] = { - {"cyapa" ,0 }, - { }, + {"cyapa" }, + { } };MODULE_DEVICE_TABLE (i2c, cyapa_id_table);
drivers/input/mouse/elan_i2c_core.c +2 -2
@@ -1392,8 +1392,8 @@ static int elan_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(elan_pm_ops, elan_suspend, elan_resume);static const struct i2c_device_id elan_id[] = { - {DRIVER_NAME ,0 }, - { }, + {DRIVER_NAME }, + { } };MODULE_DEVICE_TABLE (i2c, elan_id);
drivers/input/mouse/synaptics_i2c.c +2 -2
@@ -630,8 +630,8 @@ static DEFINE_SIMPLE_DEV_PM_OPS(synaptics_i2c_pm, synaptics_i2c_suspend, synaptics_i2c_resume);static const struct i2c_device_id synaptics_i2c_id_table[] = { - {"synaptics_i2c" ,0 }, - { }, + {"synaptics_i2c" }, + { } };MODULE_DEVICE_TABLE (i2c, synaptics_i2c_id_table);
drivers/input/rmi4/rmi_i2c.c +1 -1
@@ -365,7 +365,7 @@ static const struct dev_pm_ops rmi_i2c_pm = { };static const struct i2c_device_id rmi_id[] = { - {"rmi4_i2c" ,0 }, + {"rmi4_i2c" }, { } };MODULE_DEVICE_TABLE (i2c, rmi_id);
drivers/input/rmi4/rmi_smbus.c +1 -1
@@ -413,7 +413,7 @@ static const struct dev_pm_ops rmi_smb_pm = { };static const struct i2c_device_id rmi_id[] = { - {"rmi4_smbus" ,0 }, + {"rmi4_smbus" }, { } };MODULE_DEVICE_TABLE (i2c, rmi_id);
drivers/input/touchscreen/ad7879-i2c.c +2 -2
@@ -42,8 +42,8 @@ static int ad7879_i2c_probe(struct i2c_client *client) }static const struct i2c_device_id ad7879_id[] = { - {"ad7879" ,0 }, - {"ad7889" ,0 }, + {"ad7879" }, + {"ad7889" }, { } };MODULE_DEVICE_TABLE (i2c, ad7879_id);
drivers/input/touchscreen/ar1021_i2c.c +2 -2
@@ -164,8 +164,8 @@ static DEFINE_SIMPLE_DEV_PM_OPS(ar1021_i2c_pm, ar1021_i2c_suspend, ar1021_i2c_resume);static const struct i2c_device_id ar1021_i2c_id[] = { - {"ar1021" ,0 }, - { }, + {"ar1021" }, + { } };MODULE_DEVICE_TABLE (i2c, ar1021_i2c_id);
drivers/input/touchscreen/atmel_mxt_ts.c +5 -5
@@ -3443,11 +3443,11 @@ MODULE_DEVICE_TABLE(acpi, mxt_acpi_id);#endif static const struct i2c_device_id mxt_id[] = { - {"qt602240_ts" ,0 }, - {"atmel_mxt_ts" ,0 }, - {"atmel_mxt_tp" ,0 }, - {"maxtouch" ,0 }, - {"mXT224" ,0 }, + {"qt602240_ts" }, + {"atmel_mxt_ts" }, + {"atmel_mxt_tp" }, + {"maxtouch" }, + {"mXT224" }, { } };MODULE_DEVICE_TABLE (i2c, mxt_id);
drivers/input/touchscreen/auo-pixcir-ts.c +1 -1
@@ -617,7 +617,7 @@ static int auo_pixcir_probe(struct i2c_client *client) }static const struct i2c_device_id auo_pixcir_idtable[] = { - {"auo_pixcir_ts" ,0 }, + {"auo_pixcir_ts" }, { } };MODULE_DEVICE_TABLE (i2c, auo_pixcir_idtable);
drivers/input/touchscreen/bu21013_ts.c +1 -1
@@ -597,7 +597,7 @@ static int bu21013_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(bu21013_dev_pm_ops, bu21013_suspend, bu21013_resume);static const struct i2c_device_id bu21013_id[] = { - {DRIVER_TP ,0 }, + {DRIVER_TP }, { } };MODULE_DEVICE_TABLE (i2c, bu21013_id);
drivers/input/touchscreen/bu21029_ts.c +1 -1
@@ -441,7 +441,7 @@ static int bu21029_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(bu21029_pm_ops, bu21029_suspend, bu21029_resume);static const struct i2c_device_id bu21029_ids[] = { - {DRIVER_NAME ,0 }, + {DRIVER_NAME }, {/* sentinel */ } };MODULE_DEVICE_TABLE (i2c, bu21029_ids);
drivers/input/touchscreen/cy8ctma140.c +1 -1
@@ -322,7 +322,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(cy8ctma140_pm, cy8ctma140_suspend, cy8ctma140_resume);static const struct i2c_device_id cy8ctma140_idtable[] = { - {CY8CTMA140_NAME ,0 }, + {CY8CTMA140_NAME }, {/* sentinel */ } };MODULE_DEVICE_TABLE (i2c, cy8ctma140_idtable);
drivers/input/touchscreen/cyttsp4_i2c.c +1 -1
@@ -50,7 +50,7 @@ static void cyttsp4_i2c_remove(struct i2c_client *client) }static const struct i2c_device_id cyttsp4_i2c_id[] = { - {CYTTSP4_I2C_NAME ,0 }, + {CYTTSP4_I2C_NAME }, { } };MODULE_DEVICE_TABLE (i2c, cyttsp4_i2c_id);
drivers/input/touchscreen/cyttsp5.c +1 -1
@@ -935,7 +935,7 @@ static const struct of_device_id cyttsp5_of_match[] = {MODULE_DEVICE_TABLE (of, cyttsp5_of_match);static const struct i2c_device_id cyttsp5_i2c_id[] = { - {CYTTSP5_NAME ,0 , }, + {CYTTSP5_NAME }, { } };MODULE_DEVICE_TABLE (i2c, cyttsp5_i2c_id);
drivers/input/touchscreen/cyttsp_i2c.c +1 -1
@@ -48,7 +48,7 @@ static int cyttsp_i2c_probe(struct i2c_client *client) }static const struct i2c_device_id cyttsp_i2c_id[] = { - {CY_I2C_NAME ,0 }, + {CY_I2C_NAME }, { } };MODULE_DEVICE_TABLE (i2c, cyttsp_i2c_id);
drivers/input/touchscreen/eeti_ts.c +1 -1
@@ -273,7 +273,7 @@ static int eeti_ts_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(eeti_ts_pm, eeti_ts_suspend, eeti_ts_resume);static const struct i2c_device_id eeti_ts_id[] = { - {"eeti_ts" ,0 }, + {"eeti_ts" }, { } };MODULE_DEVICE_TABLE (i2c, eeti_ts_id);
drivers/input/touchscreen/egalax_ts.c +1 -1
@@ -218,7 +218,7 @@ static int egalax_ts_probe(struct i2c_client *client) }static const struct i2c_device_id egalax_ts_id[] = { - {"egalax_ts" ,0 }, + {"egalax_ts" }, { } };MODULE_DEVICE_TABLE (i2c, egalax_ts_id);
drivers/input/touchscreen/ektf2127.c +2 -2
@@ -335,8 +335,8 @@ MODULE_DEVICE_TABLE(of, ektf2127_of_match);#endif static const struct i2c_device_id ektf2127_i2c_id[] = { - {"ektf2127" ,0 }, - {"ektf2132" ,0 }, + {"ektf2127" }, + {"ektf2132" }, {} };MODULE_DEVICE_TABLE (i2c, ektf2127_i2c_id);
drivers/input/touchscreen/goodix.c +1 -1
@@ -1510,7 +1510,7 @@ static int goodix_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(goodix_pm_ops, goodix_suspend, goodix_resume);static const struct i2c_device_id goodix_ts_id[] = { - {"GDIX1001:00" ,0 }, + {"GDIX1001:00" }, { } };MODULE_DEVICE_TABLE (i2c, goodix_ts_id);
drivers/input/touchscreen/goodix_berlin_i2c.c +1 -1
@@ -47,7 +47,7 @@ static int goodix_berlin_i2c_probe(struct i2c_client *client) }static const struct i2c_device_id goodix_berlin_i2c_id[] = { - {"gt9916" ,0 }, + {"gt9916" }, { } };
drivers/input/touchscreen/hideep.c +1 -1
@@ -1095,7 +1095,7 @@ static int hideep_probe(struct i2c_client *client) }static const struct i2c_device_id hideep_i2c_id[] = { - {HIDEEP_I2C_NAME ,0 }, + {HIDEEP_I2C_NAME }, { } };MODULE_DEVICE_TABLE (i2c, hideep_i2c_id);
drivers/input/touchscreen/himax_hx83112b.c +1 -1
@@ -335,7 +335,7 @@ static int himax_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(himax_pm_ops, himax_suspend, himax_resume);static const struct i2c_device_id himax_ts_id[] = { - {"hx83112b" ,0 }, + {"hx83112b" }, {/* sentinel */ } };MODULE_DEVICE_TABLE (i2c, himax_ts_id);
drivers/input/touchscreen/ilitek_ts_i2c.c +2 -2
@@ -634,8 +634,8 @@ static int ilitek_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(ilitek_pm_ops, ilitek_suspend, ilitek_resume);static const struct i2c_device_id ilitek_ts_i2c_id[] = { - {ILITEK_TS_NAME ,0 }, - { }, + {ILITEK_TS_NAME }, + { } };MODULE_DEVICE_TABLE (i2c, ilitek_ts_i2c_id);
drivers/input/touchscreen/max11801_ts.c +1 -1
@@ -213,7 +213,7 @@ static int max11801_ts_probe(struct i2c_client *client) }static const struct i2c_device_id max11801_ts_id[] = { - {"max11801" ,0 }, + {"max11801" }, { } };MODULE_DEVICE_TABLE (i2c, max11801_ts_id);
drivers/input/touchscreen/mcs5000_ts.c +1 -1
@@ -266,7 +266,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(mcs5000_ts_pm, mcs5000_ts_suspend, mcs5000_ts_resume);static const struct i2c_device_id mcs5000_ts_id[] = { - {"mcs5000_ts" ,0 }, + {"mcs5000_ts" }, { } };MODULE_DEVICE_TABLE (i2c, mcs5000_ts_id);
drivers/input/touchscreen/melfas_mip4.c +2 -2
@@ -1569,8 +1569,8 @@ MODULE_DEVICE_TABLE(acpi, mip4_acpi_match);#endif static const struct i2c_device_id mip4_i2c_ids[] = { - {MIP4_DEVICE_NAME ,0 }, - { }, + {MIP4_DEVICE_NAME }, + { } };MODULE_DEVICE_TABLE (i2c, mip4_i2c_ids);
drivers/input/touchscreen/migor_ts.c +1 -1
@@ -211,7 +211,7 @@ static int migor_ts_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(migor_ts_pm, migor_ts_suspend, migor_ts_resume);static const struct i2c_device_id migor_ts_id[] = { - {"migor_ts" ,0 }, + {"migor_ts" }, { } };MODULE_DEVICE_TABLE (i2c, migor_ts_id);
drivers/input/touchscreen/mms114.c +1 -1
@@ -677,7 +677,7 @@ static int mms114_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(mms114_pm_ops, mms114_suspend, mms114_resume);static const struct i2c_device_id mms114_id[] = { - {"mms114" ,0 }, + {"mms114" }, { } };MODULE_DEVICE_TABLE (i2c, mms114_id);
drivers/input/touchscreen/raydium_i2c_ts.c +2 -2
@@ -1227,8 +1227,8 @@ static DEFINE_SIMPLE_DEV_PM_OPS(raydium_i2c_pm_ops, raydium_i2c_suspend, raydium_i2c_resume);static const struct i2c_device_id raydium_i2c_id[] = { - {"raydium_i2c" ,0 }, - {"rm32380" ,0 }, + {"raydium_i2c" }, + {"rm32380" }, {/* sentinel */ } };MODULE_DEVICE_TABLE (i2c, raydium_i2c_id);
drivers/input/touchscreen/rohm_bu21023.c +1 -1
@@ -1165,7 +1165,7 @@ static int rohm_bu21023_i2c_probe(struct i2c_client *client) }static const struct i2c_device_id rohm_bu21023_i2c_id[] = { - {BU21023_NAME ,0 }, + {BU21023_NAME }, {/* sentinel */ } };MODULE_DEVICE_TABLE (i2c, rohm_bu21023_i2c_id);
drivers/input/touchscreen/s6sy761.c +2 -2
@@ -520,8 +520,8 @@ MODULE_DEVICE_TABLE(of, s6sy761_of_match);#endif static const struct i2c_device_id s6sy761_id[] = { - {"s6sy761" ,0 }, - { }, + {"s6sy761" }, + { } };MODULE_DEVICE_TABLE (i2c, s6sy761_id);
drivers/input/touchscreen/silead.c +6 -6
@@ -785,12 +785,12 @@ static int silead_ts_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(silead_ts_pm, silead_ts_suspend, silead_ts_resume);static const struct i2c_device_id silead_ts_id[] = { - {"gsl1680" ,0 }, - {"gsl1688" ,0 }, - {"gsl3670" ,0 }, - {"gsl3675" ,0 }, - {"gsl3692" ,0 }, - {"mssl1680" ,0 }, + {"gsl1680" }, + {"gsl1688" }, + {"gsl3670" }, + {"gsl3675" }, + {"gsl3692" }, + {"mssl1680" }, { } };MODULE_DEVICE_TABLE (i2c, silead_ts_id);
drivers/input/touchscreen/sis_i2c.c +2 -2
@@ -374,8 +374,8 @@ MODULE_DEVICE_TABLE(of, sis_ts_dt_ids);#endif static const struct i2c_device_id sis_ts_id[] = { - {SIS_I2C_NAME ,0 }, - {"9200-ts" ,0 }, + {SIS_I2C_NAME }, + {"9200-ts" }, {/* sentinel */ } };MODULE_DEVICE_TABLE (i2c, sis_ts_id);
drivers/input/touchscreen/stmfts.c +2 -2
@@ -789,8 +789,8 @@ MODULE_DEVICE_TABLE(of, stmfts_of_match);#endif static const struct i2c_device_id stmfts_id[] = { - {"stmfts" ,0 }, - { }, + {"stmfts" }, + { } };MODULE_DEVICE_TABLE (i2c, stmfts_id);
drivers/input/touchscreen/tsc2004.c +1 -1
@@ -48,7 +48,7 @@ static void tsc2004_remove(struct i2c_client *i2c) }static const struct i2c_device_id tsc2004_idtable[] = { - {"tsc2004" ,0 }, + {"tsc2004" }, { } };MODULE_DEVICE_TABLE (i2c, tsc2004_idtable);
drivers/input/touchscreen/tsc2007_core.c +1 -1
@@ -400,7 +400,7 @@ static int tsc2007_probe(struct i2c_client *client) }static const struct i2c_device_id tsc2007_idtable[] = { - {"tsc2007" ,0 }, + {"tsc2007" }, { } };
drivers/input/touchscreen/wacom_i2c.c +2 -2
@@ -253,8 +253,8 @@ static int wacom_i2c_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(wacom_i2c_pm, wacom_i2c_suspend, wacom_i2c_resume);static const struct i2c_device_id wacom_i2c_id[] = { - {"WAC_I2C_EMR" ,0 }, - { }, + {"WAC_I2C_EMR" }, + { } };MODULE_DEVICE_TABLE (i2c, wacom_i2c_id);
drivers/input/touchscreen/wdt87xx_i2c.c +1 -1
@@ -1148,7 +1148,7 @@ static int wdt87xx_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(wdt87xx_pm_ops, wdt87xx_suspend, wdt87xx_resume);static const struct i2c_device_id wdt87xx_dev_id[] = { - {WDT87XX_NAME ,0 }, + {WDT87XX_NAME }, { } };MODULE_DEVICE_TABLE (i2c, wdt87xx_dev_id);
drivers/input/touchscreen/zet6223.c +1 -1
@@ -238,7 +238,7 @@ static const struct of_device_id zet6223_of_match[] = {MODULE_DEVICE_TABLE (of, zet6223_of_match);static const struct i2c_device_id zet6223_id[] = { - {"zet6223" ,0 }, + {"zet6223" }, { } };MODULE_DEVICE_TABLE (i2c, zet6223_id);
drivers/input/touchscreen/zforce_ts.c +1 -1
@@ -923,7 +923,7 @@ static int zforce_probe(struct i2c_client *client) }static struct i2c_device_id zforce_idtable[] = { - {"zforce-ts" ,0 }, + {"zforce-ts" }, { } };MODULE_DEVICE_TABLE (i2c, zforce_idtable);
base-commit: 704ba27ac55579704ba1289392448b0c66b56258
Signature · 1 line
2.43.0
Quoted 10 lines · Uwe Kleine-König
These drivers don't use the
driver_datamember of structi2c_device_id, so don't explicitly initialize this member.This prepares putting
driver_datain 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 Uwe Kleine-König <[email protected]>
Applied, thank you.
Signature · 1 line
Dmitry
Dmitry Torokhov
maintainerQuoted 8 lines · Dmitry Torokhov
Quoted 7 lines · Uwe Kleine-König
These drivers don't use the
driver_datamember of structi2c_device_id, so don't explicitly initialize this member.This prepares putting
driver_datain an anonymous union which requires either no initialization or named designators. But it's also a nice cleanup on its own.
Quoted 5 lines
Quoted 3 lines
While add it, also remove commas after the sentinel entries.
Signed-off-by Uwe Kleine-König <[email protected]>Applied, thank you.
Uwe, could you share the end goal here? It looks like there are couple of efforts to deal with driver matching data, for example I had this proposal (which I did not pursue further so far):
https://lore.kernel.org/all/[email protected]/
I think it would be good for all of use to be on the same page.
Thanks.
Signature · 1 line
Dmitry
Dmitry Torokhov
maintainer[ resending to the right address ]
Quoted 27 lines · Dmitry Torokhov
Quoted 8 lines · Dmitry Torokhov
Quoted 7 lines · Uwe Kleine-König
These drivers don't use the
driver_datamember of structi2c_device_id, so don't explicitly initialize this member.This prepares putting
driver_datain an anonymous union which requires either no initialization or named designators. But it's also a nice cleanup on its own.Quoted 5 lines
Quoted 3 lines
While add it, also remove commas after the sentinel entries.
Signed-off-by Uwe Kleine-König <[email protected]>Applied, thank you.
Uwe, could you share the end goal here? It looks like there are couple of efforts to deal with driver matching data, for example I had this proposal (which I did not pursue further so far):
https://lore.kernel.org/all/[email protected]/
I think it would be good for all of use to be on the same page.
Thanks.
Signature · 1 line
Dmitry
Signature · 1 line
Dmitry
Hello Dmitry,
Quoted 15 lines · Dmitry Torokhov
Quoted 8 lines · Dmitry Torokhov
Quoted 7 lines · Uwe Kleine-König
These drivers don't use the
driver_datamember of structi2c_device_id, so don't explicitly initialize this member.This prepares putting
driver_datain an anonymous union which requires either no initialization or named designators. But it's also a nice cleanup on its own.Quoted 5 lines
Quoted 3 lines
While add it, also remove commas after the sentinel entries.
Signed-off-by Uwe Kleine-König <[email protected]>Applied, thank you.
Quoted 7 lines
Uwe, could you share the end goal here? It looks like there are couple of efforts to deal with driver matching data, for example I had this proposal (which I did not pursue further so far):
https://lore.kernel.org/all/[email protected]/
I think it would be good for all of use to be on the same page.
My idea is described in
https://lore.kernel.org/linux-i2c/pja67neo74zw6rqpv5n7ekivlhejbmpuge6umtuatwhgjbmcwr@7u7f7vhpnwtt,
maybe with different names for the two union members. My current favorite is
void *driver_data_ptr; kernel_ulong_t driver_data;
If you have concerns/ideas, I suggest to share them in this thread such that we have the complete discussion in a single place.
Best regards
Uwe