Commit a47d377e authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Alexandre Belloni

rtc: 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 a comma after the sentinel entry in
rtc-hym8563.
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20240515194336.58342-2-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 463927a8
...@@ -933,7 +933,7 @@ MODULE_DEVICE_TABLE(of, abb5zes3_dt_match); ...@@ -933,7 +933,7 @@ MODULE_DEVICE_TABLE(of, abb5zes3_dt_match);
#endif #endif
static const struct i2c_device_id abb5zes3_id[] = { static const struct i2c_device_id abb5zes3_id[] = {
{ "abb5zes3", 0 }, { "abb5zes3" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, abb5zes3_id); MODULE_DEVICE_TABLE(i2c, abb5zes3_id);
......
...@@ -575,7 +575,7 @@ MODULE_DEVICE_TABLE(of, abeoz9_dt_match); ...@@ -575,7 +575,7 @@ MODULE_DEVICE_TABLE(of, abeoz9_dt_match);
#endif #endif
static const struct i2c_device_id abeoz9_id[] = { static const struct i2c_device_id abeoz9_id[] = {
{ "abeoz9", 0 }, { "abeoz9" },
{ } { }
}; };
......
...@@ -304,7 +304,7 @@ static void bq32k_remove(struct i2c_client *client) ...@@ -304,7 +304,7 @@ static void bq32k_remove(struct i2c_client *client)
} }
static const struct i2c_device_id bq32k_id[] = { static const struct i2c_device_id bq32k_id[] = {
{ "bq32000", 0 }, { "bq32000" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, bq32k_id); MODULE_DEVICE_TABLE(i2c, bq32k_id);
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#define DS1374_REG_TCR 0x09 /* Trickle Charge */ #define DS1374_REG_TCR 0x09 /* Trickle Charge */
static const struct i2c_device_id ds1374_id[] = { static const struct i2c_device_id ds1374_id[] = {
{ "ds1374", 0 }, { "ds1374" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, ds1374_id); MODULE_DEVICE_TABLE(i2c, ds1374_id);
......
...@@ -133,7 +133,7 @@ static int ds1672_probe(struct i2c_client *client) ...@@ -133,7 +133,7 @@ static int ds1672_probe(struct i2c_client *client)
} }
static const struct i2c_device_id ds1672_id[] = { static const struct i2c_device_id ds1672_id[] = {
{ "ds1672", 0 }, { "ds1672" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, ds1672_id); MODULE_DEVICE_TABLE(i2c, ds1672_id);
......
...@@ -586,7 +586,7 @@ static int ds3232_i2c_probe(struct i2c_client *client) ...@@ -586,7 +586,7 @@ static int ds3232_i2c_probe(struct i2c_client *client)
} }
static const struct i2c_device_id ds3232_id[] = { static const struct i2c_device_id ds3232_id[] = {
{ "ds3232", 0 }, { "ds3232" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, ds3232_id); MODULE_DEVICE_TABLE(i2c, ds3232_id);
......
...@@ -129,7 +129,7 @@ static int em3027_probe(struct i2c_client *client) ...@@ -129,7 +129,7 @@ static int em3027_probe(struct i2c_client *client)
} }
static const struct i2c_device_id em3027_id[] = { static const struct i2c_device_id em3027_id[] = {
{ "em3027", 0 }, { "em3027" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, em3027_id); MODULE_DEVICE_TABLE(i2c, em3027_id);
......
...@@ -53,7 +53,7 @@ struct fm3130 { ...@@ -53,7 +53,7 @@ struct fm3130 {
int data_valid; int data_valid;
}; };
static const struct i2c_device_id fm3130_id[] = { static const struct i2c_device_id fm3130_id[] = {
{ "fm3130", 0 }, { "fm3130" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, fm3130_id); MODULE_DEVICE_TABLE(i2c, fm3130_id);
......
...@@ -559,8 +559,8 @@ static int hym8563_probe(struct i2c_client *client) ...@@ -559,8 +559,8 @@ static int hym8563_probe(struct i2c_client *client)
} }
static const struct i2c_device_id hym8563_id[] = { static const struct i2c_device_id hym8563_id[] = {
{ "hym8563", 0 }, { "hym8563" },
{}, {}
}; };
MODULE_DEVICE_TABLE(i2c, hym8563_id); MODULE_DEVICE_TABLE(i2c, hym8563_id);
......
...@@ -366,7 +366,7 @@ static const struct of_device_id isl12022_dt_match[] = { ...@@ -366,7 +366,7 @@ static const struct of_device_id isl12022_dt_match[] = {
MODULE_DEVICE_TABLE(of, isl12022_dt_match); MODULE_DEVICE_TABLE(of, isl12022_dt_match);
static const struct i2c_device_id isl12022_id[] = { static const struct i2c_device_id isl12022_id[] = {
{ "isl12022", 0 }, { "isl12022" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, isl12022_id); MODULE_DEVICE_TABLE(i2c, isl12022_id);
......
...@@ -669,7 +669,7 @@ static int max31335_probe(struct i2c_client *client) ...@@ -669,7 +669,7 @@ static int max31335_probe(struct i2c_client *client)
} }
static const struct i2c_device_id max31335_id[] = { static const struct i2c_device_id max31335_id[] = {
{ "max31335", 0 }, { "max31335" },
{ } { }
}; };
......
...@@ -215,7 +215,7 @@ static int max6900_probe(struct i2c_client *client) ...@@ -215,7 +215,7 @@ static int max6900_probe(struct i2c_client *client)
} }
static const struct i2c_device_id max6900_id[] = { static const struct i2c_device_id max6900_id[] = {
{ "max6900", 0 }, { "max6900" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, max6900_id); MODULE_DEVICE_TABLE(i2c, max6900_id);
......
...@@ -567,7 +567,7 @@ static int nct3018y_probe(struct i2c_client *client) ...@@ -567,7 +567,7 @@ static int nct3018y_probe(struct i2c_client *client)
} }
static const struct i2c_device_id nct3018y_id[] = { static const struct i2c_device_id nct3018y_id[] = {
{ "nct3018y", 0 }, { "nct3018y" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, nct3018y_id); MODULE_DEVICE_TABLE(i2c, nct3018y_id);
......
...@@ -495,7 +495,7 @@ static int pcf8523_probe(struct i2c_client *client) ...@@ -495,7 +495,7 @@ static int pcf8523_probe(struct i2c_client *client)
} }
static const struct i2c_device_id pcf8523_id[] = { static const struct i2c_device_id pcf8523_id[] = {
{ "pcf8523", 0 }, { "pcf8523" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, pcf8523_id); MODULE_DEVICE_TABLE(i2c, pcf8523_id);
......
...@@ -594,9 +594,9 @@ static int pcf8563_probe(struct i2c_client *client) ...@@ -594,9 +594,9 @@ static int pcf8563_probe(struct i2c_client *client)
} }
static const struct i2c_device_id pcf8563_id[] = { static const struct i2c_device_id pcf8563_id[] = {
{ "pcf8563", 0 }, { "pcf8563" },
{ "rtc8564", 0 }, { "rtc8564" },
{ "pca8565", 0 }, { "pca8565" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, pcf8563_id); MODULE_DEVICE_TABLE(i2c, pcf8563_id);
......
...@@ -297,7 +297,7 @@ static int pcf8583_probe(struct i2c_client *client) ...@@ -297,7 +297,7 @@ static int pcf8583_probe(struct i2c_client *client)
} }
static const struct i2c_device_id pcf8583_id[] = { static const struct i2c_device_id pcf8583_id[] = {
{ "pcf8583", 0 }, { "pcf8583" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, pcf8583_id); MODULE_DEVICE_TABLE(i2c, pcf8583_id);
......
...@@ -807,8 +807,8 @@ static int rv3029_i2c_probe(struct i2c_client *client) ...@@ -807,8 +807,8 @@ static int rv3029_i2c_probe(struct i2c_client *client)
} }
static const struct i2c_device_id rv3029_id[] = { static const struct i2c_device_id rv3029_id[] = {
{ "rv3029", 0 }, { "rv3029" },
{ "rv3029c2", 0 }, { "rv3029c2" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, rv3029_id); MODULE_DEVICE_TABLE(i2c, rv3029_id);
......
...@@ -451,7 +451,7 @@ static const struct acpi_device_id rx6110_i2c_acpi_match[] = { ...@@ -451,7 +451,7 @@ static const struct acpi_device_id rx6110_i2c_acpi_match[] = {
MODULE_DEVICE_TABLE(acpi, rx6110_i2c_acpi_match); MODULE_DEVICE_TABLE(acpi, rx6110_i2c_acpi_match);
static const struct i2c_device_id rx6110_i2c_id[] = { static const struct i2c_device_id rx6110_i2c_id[] = {
{ "rx6110", 0 }, { "rx6110" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, rx6110_i2c_id); MODULE_DEVICE_TABLE(i2c, rx6110_i2c_id);
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#define RX8010_ALARM_AE BIT(7) #define RX8010_ALARM_AE BIT(7)
static const struct i2c_device_id rx8010_id[] = { static const struct i2c_device_id rx8010_id[] = {
{ "rx8010", 0 }, { "rx8010" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, rx8010_id); MODULE_DEVICE_TABLE(i2c, rx8010_id);
......
...@@ -307,7 +307,7 @@ static int rx8581_probe(struct i2c_client *client) ...@@ -307,7 +307,7 @@ static int rx8581_probe(struct i2c_client *client)
} }
static const struct i2c_device_id rx8581_id[] = { static const struct i2c_device_id rx8581_id[] = {
{ "rx8581", 0 }, { "rx8581" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, rx8581_id); MODULE_DEVICE_TABLE(i2c, rx8581_id);
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#define S35390A_INT2_MODE_PMIN (BIT(3) | BIT(2)) /* INT2FE | INT2ME */ #define S35390A_INT2_MODE_PMIN (BIT(3) | BIT(2)) /* INT2FE | INT2ME */
static const struct i2c_device_id s35390a_id[] = { static const struct i2c_device_id s35390a_id[] = {
{ "s35390a", 0 }, { "s35390a" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, s35390a_id); MODULE_DEVICE_TABLE(i2c, s35390a_id);
......
...@@ -201,7 +201,7 @@ static int sd3078_probe(struct i2c_client *client) ...@@ -201,7 +201,7 @@ static int sd3078_probe(struct i2c_client *client)
} }
static const struct i2c_device_id sd3078_id[] = { static const struct i2c_device_id sd3078_id[] = {
{"sd3078", 0}, { "sd3078" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, sd3078_id); MODULE_DEVICE_TABLE(i2c, sd3078_id);
......
...@@ -663,7 +663,7 @@ static void x1205_remove(struct i2c_client *client) ...@@ -663,7 +663,7 @@ static void x1205_remove(struct i2c_client *client)
} }
static const struct i2c_device_id x1205_id[] = { static const struct i2c_device_id x1205_id[] = {
{ "x1205", 0 }, { "x1205" },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, x1205_id); MODULE_DEVICE_TABLE(i2c, x1205_id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment