rtc: Use named initializers for arrays of i2c_device_data

While being less compact, using named initializers allows to more easily
see which members of the structs are assigned which value without having
to lookup the declaration of the struct. And it's also more robust
against changes to the struct definition.

The mentioned robustness is relevant for a planned change to struct
i2c_device_id that replaces .driver_data by an anonymous union.

While touching all these arrays, unify usage of whitespace and commas.

This patch doesn't modify the compiled arrays, only their representation
in source form benefits. The former was confirmed with x86 and arm64
builds.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
Reviewed-by: Tóth János <gomba007@gmail.com>
Link: https://patch.msgid.link/20260515154720.406128-2-u.kleine-koenig@baylibre.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/drivers/rtc/rtc-ab-b5ze-s3.c b/drivers/rtc/rtc-ab-b5ze-s3.c
index 684f9898d76819f7e4789f29c86351c7bb6a7af5..6439ca427c32b48fafcf1a65659b36c98146b391 100644 (file)
--- a/drivers/rtc/rtc-ab-b5ze-s3.c
+++ b/drivers/rtc/rtc-ab-b5ze-s3.c
@@ -933,7 +933,7 @@ MODULE_DEVICE_TABLE(of, abb5zes3_dt_match);
 #endif
 
 static const struct i2c_device_id abb5zes3_id[] = {
-       { "abb5zes3" },
+       { .name = "abb5zes3" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, abb5zes3_id);

diff --git a/drivers/rtc/rtc-ab-eoz9.c b/drivers/rtc/rtc-ab-eoz9.c
index de002f7a39bf40d8d317ea58b6622552cb2e2d00..b75f4f665076d3015d5e6abaf5e7d32149c4bdc5 100644 (file)
--- a/drivers/rtc/rtc-ab-eoz9.c
+++ b/drivers/rtc/rtc-ab-eoz9.c
@@ -546,7 +546,7 @@ MODULE_DEVICE_TABLE(of, abeoz9_dt_match);
 #endif
 
 static const struct i2c_device_id abeoz9_id[] = {
-       { "abeoz9" },
+       { .name = "abeoz9" },
        { }
 };
 

diff --git a/drivers/rtc/rtc-abx80x.c b/drivers/rtc/rtc-abx80x.c
index 008a70baa69fea52d82fe1d6fda5e13059759bef..5486d9d0b1e5d6f3a82719b4a1c7ea7e0d43aa4f 100644 (file)
--- a/drivers/rtc/rtc-abx80x.c
+++ b/drivers/rtc/rtc-abx80x.c
@@ -753,16 +753,16 @@ static int abx80x_setup_nvmem(struct abx80x_priv *priv)
 }
 
 static const struct i2c_device_id abx80x_id[] = {
-       { "abx80x", ABX80X },
-       { "ab0801", AB0801 },
-       { "ab0803", AB0803 },
-       { "ab0804", AB0804 },
-       { "ab0805", AB0805 },
-       { "ab1801", AB1801 },
-       { "ab1803", AB1803 },
-       { "ab1804", AB1804 },
-       { "ab1805", AB1805 },
-       { "rv1805", RV1805 },
+       { .name = "abx80x", .driver_data = ABX80X },
+       { .name = "ab0801", .driver_data = AB0801 },
+       { .name = "ab0803", .driver_data = AB0803 },
+       { .name = "ab0804", .driver_data = AB0804 },
+       { .name = "ab0805", .driver_data = AB0805 },
+       { .name = "ab1801", .driver_data = AB1801 },
+       { .name = "ab1803", .driver_data = AB1803 },
+       { .name = "ab1804", .driver_data = AB1804 },
+       { .name = "ab1805", .driver_data = AB1805 },
+       { .name = "rv1805", .driver_data = RV1805 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, abx80x_id);

diff --git a/drivers/rtc/rtc-bq32k.c b/drivers/rtc/rtc-bq32k.c
index 7ad34539be4d2eb5d18abd63ebbfa0cd78705997..20cd92d00fa14b4afea522c5077fa2c2c6c79b5f 100644 (file)
--- a/drivers/rtc/rtc-bq32k.c
+++ b/drivers/rtc/rtc-bq32k.c
@@ -304,7 +304,7 @@ static void bq32k_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id bq32k_id[] = {
-       { "bq32000" },
+       { .name = "bq32000" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, bq32k_id);

diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index edf81b975decb724f2f601b743120504a0530650..ee6e75a5efc59f52ba3cb7b11507336d3ac1d398 100644 (file)
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -1069,24 +1069,24 @@ static const struct chip_desc chips[last_ds_type] = {
 };
 
 static const struct i2c_device_id ds1307_id[] = {
-       { "ds1307", ds_1307 },
-       { "ds1308", ds_1308 },
-       { "ds1337", ds_1337 },
-       { "ds1338", ds_1338 },
-       { "ds1339", ds_1339 },
-       { "ds1388", ds_1388 },
-       { "ds1340", ds_1340 },
-       { "ds1341", ds_1341 },
-       { "ds3231", ds_3231 },
-       { "m41t0", m41t0 },
-       { "m41t00", m41t00 },
-       { "m41t11", m41t11 },
-       { "mcp7940x", mcp794xx },
-       { "mcp7941x", mcp794xx },
-       { "pt7c4338", ds_1307 },
-       { "rx8025", rx_8025 },
-       { "isl12057", ds_1337 },
-       { "rx8130", rx_8130 },
+       { .name = "ds1307", .driver_data = ds_1307 },
+       { .name = "ds1308", .driver_data = ds_1308 },
+       { .name = "ds1337", .driver_data = ds_1337 },
+       { .name = "ds1338", .driver_data = ds_1338 },
+       { .name = "ds1339", .driver_data = ds_1339 },
+       { .name = "ds1388", .driver_data = ds_1388 },
+       { .name = "ds1340", .driver_data = ds_1340 },
+       { .name = "ds1341", .driver_data = ds_1341 },
+       { .name = "ds3231", .driver_data = ds_3231 },
+       { .name = "m41t0", .driver_data = m41t0 },
+       { .name = "m41t00", .driver_data = m41t00 },
+       { .name = "m41t11", .driver_data = m41t11 },
+       { .name = "mcp7940x", .driver_data = mcp794xx },
+       { .name = "mcp7941x", .driver_data = mcp794xx },
+       { .name = "pt7c4338", .driver_data = ds_1307 },
+       { .name = "rx8025", .driver_data = rx_8025 },
+       { .name = "isl12057", .driver_data = ds_1337 },
+       { .name = "rx8130", .driver_data = rx_8130 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, ds1307_id);

diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
index c2359eb86bc92b841895026712ba8ad093fbecfe..8c247215d61164305233e3be295dd49f5f79ff4e 100644 (file)
--- a/drivers/rtc/rtc-ds1374.c
+++ b/drivers/rtc/rtc-ds1374.c
@@ -52,7 +52,7 @@
 #define DS1374_REG_TCR         0x09 /* Trickle Charge */
 
 static const struct i2c_device_id ds1374_id[] = {
-       { "ds1374" },
+       { .name = "ds1374" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, ds1374_id);

diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c
index 6e5314215d0059a2c4b980377bbc95c0c4afb38e..c610beb55bb5396c7c7fc04348758de174a33c17 100644 (file)
--- a/drivers/rtc/rtc-ds1672.c
+++ b/drivers/rtc/rtc-ds1672.c
@@ -133,7 +133,7 @@ static int ds1672_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ds1672_id[] = {
-       { "ds1672" },
+       { .name = "ds1672" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, ds1672_id);

diff --git a/drivers/rtc/rtc-ds3232.c b/drivers/rtc/rtc-ds3232.c
index 18f35823b4b5b899139a7d56bdb8ac00c9aba629..d1ef9e0dad34d1cb17e07eda0be8ac40ee51aeca 100644 (file)
--- a/drivers/rtc/rtc-ds3232.c
+++ b/drivers/rtc/rtc-ds3232.c
@@ -566,7 +566,7 @@ static int ds3232_i2c_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ds3232_id[] = {
-       { "ds3232" },
+       { .name = "ds3232" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, ds3232_id);

diff --git a/drivers/rtc/rtc-em3027.c b/drivers/rtc/rtc-em3027.c
index dc1ccbc65dcb31f154914797336532138d813144..d555e5d59881666282326b33ae2b6986690ff3ed 100644 (file)
--- a/drivers/rtc/rtc-em3027.c
+++ b/drivers/rtc/rtc-em3027.c
@@ -129,7 +129,7 @@ static int em3027_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id em3027_id[] = {
-       { "em3027" },
+       { .name = "em3027" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, em3027_id);

diff --git a/drivers/rtc/rtc-fm3130.c b/drivers/rtc/rtc-fm3130.c
index f82728ebac0c1260a304739655c54d682dcccf43..28bb6d3f644eb54d8fd0d7ffc463a788912bfc83 100644 (file)
--- a/drivers/rtc/rtc-fm3130.c
+++ b/drivers/rtc/rtc-fm3130.c
@@ -53,7 +53,7 @@ struct fm3130 {
        int                     data_valid;
 };
 static const struct i2c_device_id fm3130_id[] = {
-       { "fm3130" },
+       { .name = "fm3130" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, fm3130_id);

diff --git a/drivers/rtc/rtc-hym8563.c b/drivers/rtc/rtc-hym8563.c
index 7a170c0f97109f9a2bc08946845cb8bb5a377bd7..3156aa5f2d9ff2645775d8dd508ff93abe4ddac8 100644 (file)
--- a/drivers/rtc/rtc-hym8563.c
+++ b/drivers/rtc/rtc-hym8563.c
@@ -564,8 +564,8 @@ static int hym8563_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id hym8563_id[] = {
-       { "hym8563" },
-       {}
+       { .name = "hym8563" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, hym8563_id);
 

diff --git a/drivers/rtc/rtc-isl12022.c b/drivers/rtc/rtc-isl12022.c
index 5fc52dc6421305e957a0c3a169009c3f6a6c7320..bc36288854ee7a20c3746432005c461e70187966 100644 (file)
--- a/drivers/rtc/rtc-isl12022.c
+++ b/drivers/rtc/rtc-isl12022.c
@@ -604,7 +604,7 @@ static const struct of_device_id isl12022_dt_match[] = {
 MODULE_DEVICE_TABLE(of, isl12022_dt_match);
 
 static const struct i2c_device_id isl12022_id[] = {
-       { "isl12022" },
+       { .name = "isl12022" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, isl12022_id);

diff --git a/drivers/rtc/rtc-isl12026.c b/drivers/rtc/rtc-isl12026.c
index 45a2c9f676c53f3e32f7d91a95352b6c8f62cd5d..b86a325d8a23f1d126319c19bbd0813991c42a1f 100644 (file)
--- a/drivers/rtc/rtc-isl12026.c
+++ b/drivers/rtc/rtc-isl12026.c
@@ -485,8 +485,8 @@ static const struct of_device_id isl12026_dt_match[] = {
 MODULE_DEVICE_TABLE(of, isl12026_dt_match);
 
 static const struct i2c_device_id isl12026_id[] = {
-       { "isl12026" },
-       { },
+       { .name = "isl12026" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, isl12026_id);
 

diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c
index f71a6bb77b2a14e0c29db3ba1400af91a1395f46..bcaa766a506865f21f7efc7ea3a1e00beab79dff 100644 (file)
--- a/drivers/rtc/rtc-isl1208.c
+++ b/drivers/rtc/rtc-isl1208.c
@@ -110,11 +110,11 @@ static const struct isl1208_config config_raa215300_a0 = {
 };
 
 static const struct i2c_device_id isl1208_id[] = {
-       { "isl1208", .driver_data = (kernel_ulong_t)&config_isl1208 },
-       { "isl1209", .driver_data = (kernel_ulong_t)&config_isl1209 },
-       { "isl1218", .driver_data = (kernel_ulong_t)&config_isl1218 },
-       { "isl1219", .driver_data = (kernel_ulong_t)&config_isl1219 },
-       { "raa215300_a0", .driver_data = (kernel_ulong_t)&config_raa215300_a0 },
+       { .name = "isl1208", .driver_data = (kernel_ulong_t)&config_isl1208 },
+       { .name = "isl1209", .driver_data = (kernel_ulong_t)&config_isl1209 },
+       { .name = "isl1218", .driver_data = (kernel_ulong_t)&config_isl1218 },
+       { .name = "isl1219", .driver_data = (kernel_ulong_t)&config_isl1219 },
+       { .name = "raa215300_a0", .driver_data = (kernel_ulong_t)&config_raa215300_a0 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, isl1208_id);

diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index b26afef37d9cf5345934b8c2663fd7fdc3069ea5..3c8c379392c140780e5872690fd97eab8dee6a7b 100644 (file)
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -71,17 +71,17 @@
 #define M41T80_FEATURE_SQ_ALT  BIT(4)  /* RSx bits are in reg 4 */
 
 static const struct i2c_device_id m41t80_id[] = {
-       { "m41t62", M41T80_FEATURE_SQ | M41T80_FEATURE_SQ_ALT },
-       { "m41t65", M41T80_FEATURE_WD },
-       { "m41t80", M41T80_FEATURE_SQ },
-       { "m41t81", M41T80_FEATURE_HT | M41T80_FEATURE_SQ},
-       { "m41t81s", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
-       { "m41t82", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
-       { "m41t83", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
-       { "m41st84", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
-       { "m41st85", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
-       { "m41st87", M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
-       { "rv4162", M41T80_FEATURE_SQ | M41T80_FEATURE_WD | M41T80_FEATURE_SQ_ALT },
+       { .name = "m41t62", .driver_data = M41T80_FEATURE_SQ | M41T80_FEATURE_SQ_ALT },
+       { .name = "m41t65", .driver_data = M41T80_FEATURE_WD },
+       { .name = "m41t80", .driver_data = M41T80_FEATURE_SQ },
+       { .name = "m41t81", .driver_data = M41T80_FEATURE_HT | M41T80_FEATURE_SQ},
+       { .name = "m41t81s", .driver_data = M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
+       { .name = "m41t82", .driver_data = M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
+       { .name = "m41t83", .driver_data = M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
+       { .name = "m41st84", .driver_data = M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
+       { .name = "m41st85", .driver_data = M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
+       { .name = "m41st87", .driver_data = M41T80_FEATURE_HT | M41T80_FEATURE_BL | M41T80_FEATURE_SQ },
+       { .name = "rv4162", .driver_data = M41T80_FEATURE_SQ | M41T80_FEATURE_WD | M41T80_FEATURE_SQ_ALT },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, m41t80_id);

diff --git a/drivers/rtc/rtc-max31335.c b/drivers/rtc/rtc-max31335.c
index 952b455071d68bec04f8554e3fcfad715fcedf76..59581697385115da8500b7180d49ead4b93c9449 100644 (file)
--- a/drivers/rtc/rtc-max31335.c
+++ b/drivers/rtc/rtc-max31335.c
@@ -745,8 +745,8 @@ static int max31335_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id max31335_id[] = {
-       { "max31331", (kernel_ulong_t)&chip[ID_MAX31331] },
-       { "max31335", (kernel_ulong_t)&chip[ID_MAX31335] },
+       { .name = "max31331", .driver_data = (kernel_ulong_t)&chip[ID_MAX31331] },
+       { .name = "max31335", .driver_data = (kernel_ulong_t)&chip[ID_MAX31335] },
        { }
 };
 

diff --git a/drivers/rtc/rtc-max6900.c b/drivers/rtc/rtc-max6900.c
index 7be31fce5bc748a70150ce3f97f6947246509fc4..8ef6d0fcd0321ea2dccc964a43c4dcd3ad444606 100644 (file)
--- a/drivers/rtc/rtc-max6900.c
+++ b/drivers/rtc/rtc-max6900.c
@@ -215,7 +215,7 @@ static int max6900_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id max6900_id[] = {
-       { "max6900" },
+       { .name = "max6900" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, max6900_id);

diff --git a/drivers/rtc/rtc-nct3018y.c b/drivers/rtc/rtc-nct3018y.c
index cd4b1db902e9f68781787236bec56c2cae8436ab..700a395fad3a63b6680c8d157d1cc332c14625e1 100644 (file)
--- a/drivers/rtc/rtc-nct3018y.c
+++ b/drivers/rtc/rtc-nct3018y.c
@@ -572,7 +572,7 @@ static int nct3018y_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id nct3018y_id[] = {
-       { "nct3018y" },
+       { .name = "nct3018y" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, nct3018y_id);

diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c
index e4785c5a55d0383d3e3264cece0493b5271845fa..1995e9f2756ddd3d74f6f6777f6bb22deaf05867 100644 (file)
--- a/drivers/rtc/rtc-pcf2127.c
+++ b/drivers/rtc/rtc-pcf2127.c
@@ -1449,10 +1449,10 @@ static const struct regmap_bus pcf2127_i2c_regmap = {
 static struct i2c_driver pcf2127_i2c_driver;
 
 static const struct i2c_device_id pcf2127_i2c_id[] = {
-       { "pcf2127", (kernel_ulong_t)&pcf21xx_cfg[PCF2127] },
-       { "pcf2129", (kernel_ulong_t)&pcf21xx_cfg[PCF2129] },
-       { "pca2129", (kernel_ulong_t)&pcf21xx_cfg[PCF2129] },
-       { "pcf2131", (kernel_ulong_t)&pcf21xx_cfg[PCF2131] },
+       { .name = "pcf2127", .driver_data = (kernel_ulong_t)&pcf21xx_cfg[PCF2127] },
+       { .name = "pcf2129", .driver_data = (kernel_ulong_t)&pcf21xx_cfg[PCF2129] },
+       { .name = "pca2129", .driver_data = (kernel_ulong_t)&pcf21xx_cfg[PCF2129] },
+       { .name = "pcf2131", .driver_data = (kernel_ulong_t)&pcf21xx_cfg[PCF2131] },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, pcf2127_i2c_id);

diff --git a/drivers/rtc/rtc-pcf85063.c b/drivers/rtc/rtc-pcf85063.c
index f643e0bd735192f7de91750a1a84efc44533019e..01e209d88f5f357f079b9b1f169f9310d01ff6db 100644 (file)
--- a/drivers/rtc/rtc-pcf85063.c
+++ b/drivers/rtc/rtc-pcf85063.c
@@ -665,12 +665,12 @@ static const struct pcf85063_config config_rv8263 = {
 };
 
 static const struct i2c_device_id pcf85063_ids[] = {
-       { "pca85073a", .driver_data = (kernel_ulong_t)&config_pcf85063a },
-       { "pcf85063", .driver_data = (kernel_ulong_t)&config_pcf85063 },
-       { "pcf85063tp", .driver_data = (kernel_ulong_t)&config_pcf85063tp },
-       { "pcf85063a", .driver_data = (kernel_ulong_t)&config_pcf85063a },
-       { "rv8263", .driver_data = (kernel_ulong_t)&config_rv8263 },
-       {}
+       { .name = "pca85073a", .driver_data = (kernel_ulong_t)&config_pcf85063a },
+       { .name = "pcf85063", .driver_data = (kernel_ulong_t)&config_pcf85063 },
+       { .name = "pcf85063tp", .driver_data = (kernel_ulong_t)&config_pcf85063tp },
+       { .name = "pcf85063a", .driver_data = (kernel_ulong_t)&config_pcf85063a },
+       { .name = "rv8263", .driver_data = (kernel_ulong_t)&config_rv8263 },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, pcf85063_ids);
 

diff --git a/drivers/rtc/rtc-pcf8523.c b/drivers/rtc/rtc-pcf8523.c
index 2c63c0ffd05a1ae792048a3e2664d65b3b0bce6e..e8354953836c27f2dac7e9da299548481cee97b7 100644 (file)
--- a/drivers/rtc/rtc-pcf8523.c
+++ b/drivers/rtc/rtc-pcf8523.c
@@ -495,7 +495,7 @@ static int pcf8523_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id pcf8523_id[] = {
-       { "pcf8523" },
+       { .name = "pcf8523" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, pcf8523_id);

diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index b281e9489df1d4ddea0ad9c45f5c71c41ede6c50..81d13733b1e9372f2dc3930c8f372f8b3f479d31 100644 (file)
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -557,9 +557,9 @@ static int pcf8563_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id pcf8563_id[] = {
-       { "pcf8563" },
-       { "rtc8564" },
-       { "pca8565" },
+       { .name = "pcf8563" },
+       { .name = "rtc8564" },
+       { .name = "pca8565" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, pcf8563_id);

diff --git a/drivers/rtc/rtc-pcf8583.c b/drivers/rtc/rtc-pcf8583.c
index 652b9dfa75669630aa3211a5b83b76f90560a886..df5e20cbc26cbf4dfc249a240605450b71f6f2d5 100644 (file)
--- a/drivers/rtc/rtc-pcf8583.c
+++ b/drivers/rtc/rtc-pcf8583.c
@@ -297,7 +297,7 @@ static int pcf8583_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id pcf8583_id[] = {
-       { "pcf8583" },
+       { .name = "pcf8583" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, pcf8583_id);

diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c
index 936f4f05c8c7a81f1f3f5b8550aacfb38f6814ff..24bd795d9d95d4c7ef8d8b8ae31994cb5afb5207 100644 (file)
--- a/drivers/rtc/rtc-rs5c372.c
+++ b/drivers/rtc/rtc-rs5c372.c
@@ -75,12 +75,12 @@ enum rtc_type {
 };
 
 static const struct i2c_device_id rs5c372_id[] = {
-       { "r2025sd", rtc_r2025sd },
-       { "r2221tl", rtc_r2221tl },
-       { "rs5c372a", rtc_rs5c372a },
-       { "rs5c372b", rtc_rs5c372b },
-       { "rv5c386", rtc_rv5c386 },
-       { "rv5c387a", rtc_rv5c387a },
+       { .name = "r2025sd", .driver_data = rtc_r2025sd },
+       { .name = "r2221tl", .driver_data = rtc_r2221tl },
+       { .name = "rs5c372a", .driver_data = rtc_rs5c372a },
+       { .name = "rs5c372b", .driver_data = rtc_rs5c372b },
+       { .name = "rv5c386", .driver_data = rtc_rv5c386 },
+       { .name = "rv5c387a", .driver_data = rtc_rv5c387a },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, rs5c372_id);

diff --git a/drivers/rtc/rtc-rv3029c2.c b/drivers/rtc/rtc-rv3029c2.c
index 83331d1fcab06b3b361b53621d902544da396998..98953af2a24a5451cbc7617ea2104310454d901a 100644 (file)
--- a/drivers/rtc/rtc-rv3029c2.c
+++ b/drivers/rtc/rtc-rv3029c2.c
@@ -807,8 +807,8 @@ static int rv3029_i2c_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id rv3029_id[] = {
-       { "rv3029" },
-       { "rv3029c2" },
+       { .name = "rv3029" },
+       { .name = "rv3029c2" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, rv3029_id);

diff --git a/drivers/rtc/rtc-rv8803.c b/drivers/rtc/rtc-rv8803.c
index 2bf988a89fd7bda26ddba7d004230a9301ce1262..b9b5fee16ee439f00700fd3596c26c970a1ce348 100644 (file)
--- a/drivers/rtc/rtc-rv8803.c
+++ b/drivers/rtc/rtc-rv8803.c
@@ -631,10 +631,10 @@ static int rv8803_suspend(struct device *dev)
 static DEFINE_SIMPLE_DEV_PM_OPS(rv8803_pm_ops, rv8803_suspend, rv8803_resume);
 
 static const struct i2c_device_id rv8803_id[] = {
-       { "rv8803", rv_8803 },
-       { "rv8804", rx_8804 },
-       { "rx8803", rx_8803 },
-       { "rx8900", rx_8900 },
+       { .name = "rv8803", .driver_data = rv_8803 },
+       { .name = "rv8804", .driver_data = rx_8804 },
+       { .name = "rx8803", .driver_data = rx_8803 },
+       { .name = "rx8900", .driver_data = rx_8900 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, rv8803_id);

diff --git a/drivers/rtc/rtc-rx6110.c b/drivers/rtc/rtc-rx6110.c
index 07bf35ac8d79bf47bc289b1bfb265789ec609265..1eacd470a27c119668cc9a51815ef6eacc414d23 100644 (file)
--- a/drivers/rtc/rtc-rx6110.c
+++ b/drivers/rtc/rtc-rx6110.c
@@ -449,7 +449,7 @@ static const struct acpi_device_id rx6110_i2c_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, rx6110_i2c_acpi_match);
 
 static const struct i2c_device_id rx6110_i2c_id[] = {
-       { "rx6110" },
+       { .name = "rx6110" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, rx6110_i2c_id);

diff --git a/drivers/rtc/rtc-rx8010.c b/drivers/rtc/rtc-rx8010.c
index 171240e50f489e150e9b1e4ea419fe1ad0c9317f..ce39541323360651a5ae243b5a14c4d69c52a192 100644 (file)
--- a/drivers/rtc/rtc-rx8010.c
+++ b/drivers/rtc/rtc-rx8010.c
@@ -50,7 +50,7 @@
 #define RX8010_ALARM_AE                BIT(7)
 
 static const struct i2c_device_id rx8010_id[] = {
-       { "rx8010" },
+       { .name = "rx8010" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, rx8010_id);

diff --git a/drivers/rtc/rtc-rx8025.c b/drivers/rtc/rtc-rx8025.c
index c57081f9e02b474f83c763f84078a8dcfd9cbd94..5eeaa929f3ef85b92bc76d937569e40e80fde42b 100644 (file)
--- a/drivers/rtc/rtc-rx8025.c
+++ b/drivers/rtc/rtc-rx8025.c
@@ -71,8 +71,8 @@ enum rx_model {
 };
 
 static const struct i2c_device_id rx8025_id[] = {
-       { "rx8025", model_rx_8025 },
-       { "rx8035", model_rx_8035 },
+       { .name = "rx8025", .driver_data = model_rx_8025 },
+       { .name = "rx8035", .driver_data = model_rx_8035 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, rx8025_id);

diff --git a/drivers/rtc/rtc-rx8581.c b/drivers/rtc/rtc-rx8581.c
index 20c2dff01bae833ae4e100cc38cd5f030017be75..cf4dab94c337b03ab204296fed56af106d6b5977 100644 (file)
--- a/drivers/rtc/rtc-rx8581.c
+++ b/drivers/rtc/rtc-rx8581.c
@@ -294,7 +294,7 @@ static int rx8581_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id rx8581_id[] = {
-       { "rx8581" },
+       { .name = "rx8581" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, rx8581_id);

diff --git a/drivers/rtc/rtc-s35390a.c b/drivers/rtc/rtc-s35390a.c
index a4678d7c6cf63836202650dfc8ccf790ff7de2bd..31394f34fb70a7fac59c7b24d12d48cca5c65d2a 100644 (file)
--- a/drivers/rtc/rtc-s35390a.c
+++ b/drivers/rtc/rtc-s35390a.c
@@ -51,7 +51,7 @@
 #define S35390A_INT2_MODE_PMIN         (BIT(3) | BIT(2)) /* INT2FE | INT2ME */
 
 static const struct i2c_device_id s35390a_id[] = {
-       { "s35390a" },
+       { .name = "s35390a" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, s35390a_id);

diff --git a/drivers/rtc/rtc-sd2405al.c b/drivers/rtc/rtc-sd2405al.c
index 708ea5d964debf49fcdd4e53314beacd4da9cdf3..7982a910a537682ea678956d3b05786a8c792ed2 100644 (file)
--- a/drivers/rtc/rtc-sd2405al.c
+++ b/drivers/rtc/rtc-sd2405al.c
@@ -202,7 +202,7 @@ static int sd2405al_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id sd2405al_id[] = {
-       { "sd2405al" },
+       { .name = "sd2405al" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(i2c, sd2405al_id);

diff --git a/drivers/rtc/rtc-sd3078.c b/drivers/rtc/rtc-sd3078.c
index 10cc1dcfc7748144f51ef674939506feee1fb471..2c61f0e204a402f61db92f57ecd7ff0a481dacac 100644 (file)
--- a/drivers/rtc/rtc-sd3078.c
+++ b/drivers/rtc/rtc-sd3078.c
@@ -186,7 +186,7 @@ static int sd3078_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id sd3078_id[] = {
-       { "sd3078" },
+       { .name = "sd3078" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, sd3078_id);

diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c
index b8a0fccef14e03adcacd8ee2a8045ba2529ad5db..bb1a5c86f6216fabd39c699f6c572c460b44e5d0 100644 (file)
--- a/drivers/rtc/rtc-x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -663,7 +663,7 @@ static void x1205_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id x1205_id[] = {
-       { "x1205" },
+       { .name = "x1205" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, x1205_id);