media: 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>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/cec/i2c/tda9950.c b/drivers/media/cec/i2c/tda9950.c
index cbff851e0c85f8dd5c10a086b81d8a0e95a8b5a8..2bece4e636872320f19ba17afc2b29ecda01772e 100644 (file)
--- a/drivers/media/cec/i2c/tda9950.c
+++ b/drivers/media/cec/i2c/tda9950.c
@@ -486,7 +486,7 @@ static void tda9950_remove(struct i2c_client *client)
 }
 
 static struct i2c_device_id tda9950_ids[] = {
-       { "tda9950" },
+       { .name = "tda9950" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tda9950_ids);

diff --git a/drivers/media/dvb-frontends/a8293.c b/drivers/media/dvb-frontends/a8293.c
index 7c0963054a8f83b4b9edb2cc7025287875dd71c6..52e3dc92832703586e35438a4a6d5a59af08959c 100644 (file)
--- a/drivers/media/dvb-frontends/a8293.c
+++ b/drivers/media/dvb-frontends/a8293.c
@@ -256,8 +256,8 @@ static void a8293_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id a8293_id_table[] = {
-       { "a8293" },
-       {}
+       { .name = "a8293" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, a8293_id_table);
 

diff --git a/drivers/media/dvb-frontends/af9013.c b/drivers/media/dvb-frontends/af9013.c
index 75f3063c193e72b51e4e10e76f63f69a3a1e89a5..d335bfd18e440e28211e948930d96aa807c2337f 100644 (file)
--- a/drivers/media/dvb-frontends/af9013.c
+++ b/drivers/media/dvb-frontends/af9013.c
@@ -1553,8 +1553,8 @@ static void af9013_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id af9013_id_table[] = {
-       { "af9013" },
-       {}
+       { .name = "af9013" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, af9013_id_table);
 

diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index 9a3a4d6513ddeaf81a0411b3f3961e63c52bc9ca..01761861b01f4d2f2f4bde358f64d63d8d12914b 100644 (file)
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -1173,8 +1173,8 @@ static void af9033_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id af9033_id_table[] = {
-       { "af9033" },
-       {}
+       { .name = "af9033" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, af9033_id_table);
 

diff --git a/drivers/media/dvb-frontends/au8522_decoder.c b/drivers/media/dvb-frontends/au8522_decoder.c
index 58b959b272c6f15c1e3c0042ddc591199463e4a3..9ae47ea3976b84ff32a493e28f52f79f73ecfab0 100644 (file)
--- a/drivers/media/dvb-frontends/au8522_decoder.c
+++ b/drivers/media/dvb-frontends/au8522_decoder.c
@@ -768,8 +768,8 @@ static void au8522_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id au8522_id[] = {
-       { "au8522" },
-       {}
+       { .name = "au8522" },
+       { }
 };
 
 MODULE_DEVICE_TABLE(i2c, au8522_id);

diff --git a/drivers/media/dvb-frontends/cxd2099.c b/drivers/media/dvb-frontends/cxd2099.c
index f95950a6130747507dd9961736e2d44c36bd587b..e6110af1edcdf92da8e6b58e094d361c32f37e8d 100644 (file)
--- a/drivers/media/dvb-frontends/cxd2099.c
+++ b/drivers/media/dvb-frontends/cxd2099.c
@@ -672,8 +672,8 @@ static void cxd2099_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id cxd2099_id[] = {
-       { "cxd2099" },
-       {}
+       { .name = "cxd2099" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, cxd2099_id);
 

diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c
index 3deefeff4bd197608e10519873c120867ef13dce..fbbffe9e7251510d3735c4eccb242a0964d0c027 100644 (file)
--- a/drivers/media/dvb-frontends/cxd2820r_core.c
+++ b/drivers/media/dvb-frontends/cxd2820r_core.c
@@ -723,8 +723,8 @@ static void cxd2820r_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id cxd2820r_id_table[] = {
-       { "cxd2820r" },
-       {}
+       { .name = "cxd2820r" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, cxd2820r_id_table);
 

diff --git a/drivers/media/dvb-frontends/dvb-pll.c b/drivers/media/dvb-frontends/dvb-pll.c
index f8fd23f60e3fb56faf8b92bf7141a6fb3e035aa5..d36c163b772fc938c78adeb08f70f484edbcdf45 100644 (file)
--- a/drivers/media/dvb-frontends/dvb-pll.c
+++ b/drivers/media/dvb-frontends/dvb-pll.c
@@ -911,28 +911,28 @@ static void dvb_pll_remove(struct i2c_client *client)
 
 
 static const struct i2c_device_id dvb_pll_id[] = {
-       {"dtt7579",             DVB_PLL_THOMSON_DTT7579},
-       {"dtt759x",             DVB_PLL_THOMSON_DTT759X},
-       {"z201",                DVB_PLL_LG_Z201},
-       {"unknown_1",           DVB_PLL_UNKNOWN_1},
-       {"tua6010xs",           DVB_PLL_TUA6010XS},
-       {"env57h1xd5",          DVB_PLL_ENV57H1XD5},
-       {"tua6034",             DVB_PLL_TUA6034},
-       {"tda665x",             DVB_PLL_TDA665X},
-       {"tded4",               DVB_PLL_TDED4},
-       {"tdhu2",               DVB_PLL_TDHU2},
-       {"tbmv",                DVB_PLL_SAMSUNG_TBMV},
-       {"sd1878_tda8261",      DVB_PLL_PHILIPS_SD1878_TDA8261},
-       {"opera1",              DVB_PLL_OPERA1},
-       {"dtos403ih102a",       DVB_PLL_SAMSUNG_DTOS403IH102A},
-       {"tdtc9251dh0",         DVB_PLL_SAMSUNG_TDTC9251DH0},
-       {"tbdu18132",           DVB_PLL_SAMSUNG_TBDU18132},
-       {"tbmu24112",           DVB_PLL_SAMSUNG_TBMU24112},
-       {"tdee4",               DVB_PLL_TDEE4},
-       {"dtt7520x",            DVB_PLL_THOMSON_DTT7520X},
-       {"tua6034_friio",       DVB_PLL_TUA6034_FRIIO},
-       {"tda665x_earthpt1",    DVB_PLL_TDA665X_EARTH_PT1},
-       {}
+       { .name = "dtt7579",             .driver_data = DVB_PLL_THOMSON_DTT7579 },
+       { .name = "dtt759x",             .driver_data = DVB_PLL_THOMSON_DTT759X },
+       { .name = "z201",                .driver_data = DVB_PLL_LG_Z201 },
+       { .name = "unknown_1",           .driver_data = DVB_PLL_UNKNOWN_1 },
+       { .name = "tua6010xs",           .driver_data = DVB_PLL_TUA6010XS },
+       { .name = "env57h1xd5",          .driver_data = DVB_PLL_ENV57H1XD5 },
+       { .name = "tua6034",             .driver_data = DVB_PLL_TUA6034 },
+       { .name = "tda665x",             .driver_data = DVB_PLL_TDA665X },
+       { .name = "tded4",               .driver_data = DVB_PLL_TDED4 },
+       { .name = "tdhu2",               .driver_data = DVB_PLL_TDHU2 },
+       { .name = "tbmv",                .driver_data = DVB_PLL_SAMSUNG_TBMV },
+       { .name = "sd1878_tda8261",      .driver_data = DVB_PLL_PHILIPS_SD1878_TDA8261 },
+       { .name = "opera1",              .driver_data = DVB_PLL_OPERA1 },
+       { .name = "dtos403ih102a",       .driver_data = DVB_PLL_SAMSUNG_DTOS403IH102A },
+       { .name = "tdtc9251dh0",         .driver_data = DVB_PLL_SAMSUNG_TDTC9251DH0 },
+       { .name = "tbdu18132",           .driver_data = DVB_PLL_SAMSUNG_TBDU18132 },
+       { .name = "tbmu24112",           .driver_data = DVB_PLL_SAMSUNG_TBMU24112 },
+       { .name = "tdee4",               .driver_data = DVB_PLL_TDEE4 },
+       { .name = "dtt7520x",            .driver_data = DVB_PLL_THOMSON_DTT7520X },
+       { .name = "tua6034_friio",       .driver_data = DVB_PLL_TUA6034_FRIIO },
+       { .name = "tda665x_earthpt1",    .driver_data = DVB_PLL_TDA665X_EARTH_PT1 },
+       { }
 };
 
 

diff --git a/drivers/media/dvb-frontends/helene.c b/drivers/media/dvb-frontends/helene.c
index 1402d124544efa4ded6b4bc9d6e8c930fbd4a15a..993280fefc2ce5f1bbf70c603972f078b74aebd6 100644 (file)
--- a/drivers/media/dvb-frontends/helene.c
+++ b/drivers/media/dvb-frontends/helene.c
@@ -1101,8 +1101,8 @@ static int helene_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id helene_id[] = {
-       { "helene", },
-       {}
+       { .name = "helene" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, helene_id);
 

diff --git a/drivers/media/dvb-frontends/lgdt3306a.c b/drivers/media/dvb-frontends/lgdt3306a.c
index b6a66e122ed5a83d8659f3a9ed2b4567c8c34927..f4a3136baea3a89e8ae5ba26bc69dbb1047b1daf 100644 (file)
--- a/drivers/media/dvb-frontends/lgdt3306a.c
+++ b/drivers/media/dvb-frontends/lgdt3306a.c
@@ -2244,8 +2244,8 @@ static void lgdt3306a_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id lgdt3306a_id_table[] = {
-       { "lgdt3306a" },
-       {}
+       { .name = "lgdt3306a" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, lgdt3306a_id_table);
 

diff --git a/drivers/media/dvb-frontends/lgdt330x.c b/drivers/media/dvb-frontends/lgdt330x.c
index 19a4a05b349956c420a04e355e95b483051293ca..d90f642e9237c26f14557ed08c67afcaa8a302bd 100644 (file)
--- a/drivers/media/dvb-frontends/lgdt330x.c
+++ b/drivers/media/dvb-frontends/lgdt330x.c
@@ -983,8 +983,8 @@ static void lgdt330x_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id lgdt330x_id_table[] = {
-       { "lgdt330x" },
-       {}
+       { .name = "lgdt330x" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, lgdt330x_id_table);
 

diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c
index 44bee1f3c5e96824d5f5c35fe2fe0ccb3ad39a7b..d79b88848a8c309412c2fb42eacd9ca6ed5cae53 100644 (file)
--- a/drivers/media/dvb-frontends/m88ds3103.c
+++ b/drivers/media/dvb-frontends/m88ds3103.c
@@ -2221,11 +2221,11 @@ static void m88ds3103_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id m88ds3103_id_table[] = {
-       {"m88ds3103",  M88DS3103_CHIPTYPE_3103},
-       {"m88rs6000",  M88DS3103_CHIPTYPE_RS6000},
-       {"m88ds3103b", M88DS3103_CHIPTYPE_3103B},
-       {"m88ds3103c", M88DS3103_CHIPTYPE_3103C},
-       {}
+       { .name = "m88ds3103", .driver_data = M88DS3103_CHIPTYPE_3103 },
+       { .name = "m88rs6000", .driver_data = M88DS3103_CHIPTYPE_RS6000 },
+       { .name = "m88ds3103b", .driver_data = M88DS3103_CHIPTYPE_3103B },
+       { .name = "m88ds3103c", .driver_data = M88DS3103_CHIPTYPE_3103C },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, m88ds3103_id_table);
 

diff --git a/drivers/media/dvb-frontends/mn88443x.c b/drivers/media/dvb-frontends/mn88443x.c
index 818c4e67364c7c6ec2bfc17f21e2cac360f6bfb3..cc6bd17daf73b0f87ed833d9c7f0a81012c036c2 100644 (file)
--- a/drivers/media/dvb-frontends/mn88443x.c
+++ b/drivers/media/dvb-frontends/mn88443x.c
@@ -787,10 +787,10 @@ static const struct of_device_id mn88443x_of_match[] = {
 MODULE_DEVICE_TABLE(of, mn88443x_of_match);
 
 static const struct i2c_device_id mn88443x_i2c_id[] = {
-       { "mn884433",   (kernel_ulong_t)&mn88443x_spec_pri },
-       { "mn884434-0", (kernel_ulong_t)&mn88443x_spec_pri },
-       { "mn884434-1", (kernel_ulong_t)&mn88443x_spec_sec },
-       {}
+       { .name = "mn884433", .driver_data = (kernel_ulong_t)&mn88443x_spec_pri },
+       { .name = "mn884434-0", .driver_data = (kernel_ulong_t)&mn88443x_spec_pri },
+       { .name = "mn884434-1", .driver_data = (kernel_ulong_t)&mn88443x_spec_sec },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, mn88443x_i2c_id);
 

diff --git a/drivers/media/dvb-frontends/mn88472.c b/drivers/media/dvb-frontends/mn88472.c
index 275c404ce2864e59e88943b049746a6422eebffa..42b78b9aba205d092c5b8176d331c6c0dc583e8f 100644 (file)
--- a/drivers/media/dvb-frontends/mn88472.c
+++ b/drivers/media/dvb-frontends/mn88472.c
@@ -708,8 +708,8 @@ static void mn88472_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id mn88472_id_table[] = {
-       { "mn88472" },
-       {}
+       { .name = "mn88472" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, mn88472_id_table);
 

diff --git a/drivers/media/dvb-frontends/mn88473.c b/drivers/media/dvb-frontends/mn88473.c
index 40a0cb1d9c67579efa0cc4b5f33c51123985ef6c..b7b11a000969a45ff14fded33a098a2735175462 100644 (file)
--- a/drivers/media/dvb-frontends/mn88473.c
+++ b/drivers/media/dvb-frontends/mn88473.c
@@ -743,8 +743,8 @@ static void mn88473_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id mn88473_id_table[] = {
-       { "mn88473" },
-       {}
+       { .name = "mn88473" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, mn88473_id_table);
 

diff --git a/drivers/media/dvb-frontends/mxl692.c b/drivers/media/dvb-frontends/mxl692.c
index 2d8eaa20723f0be6bba1237813b028f286c70c29..bca4a4c3dd6638ea5db6e769f9d770dc04b9b430 100644 (file)
--- a/drivers/media/dvb-frontends/mxl692.c
+++ b/drivers/media/dvb-frontends/mxl692.c
@@ -1346,8 +1346,8 @@ static void mxl692_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id mxl692_id_table[] = {
-       { "mxl692" },
-       {}
+       { .name = "mxl692" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, mxl692_id_table);
 

diff --git a/drivers/media/dvb-frontends/rtl2830.c b/drivers/media/dvb-frontends/rtl2830.c
index f0ee7c38ee79ab4b9772308b85a7bb79885f6f42..4c44e2d695f82db9983d6d672feac40a362d1710 100644 (file)
--- a/drivers/media/dvb-frontends/rtl2830.c
+++ b/drivers/media/dvb-frontends/rtl2830.c
@@ -876,8 +876,8 @@ static void rtl2830_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id rtl2830_id_table[] = {
-       { "rtl2830" },
-       {}
+       { .name = "rtl2830" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, rtl2830_id_table);
 

diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c
index 9898f729304ae03875449b7c2046d21d71010ed5..b31cdb44b383e8298d8e8a18b56190cf6057e0e6 100644 (file)
--- a/drivers/media/dvb-frontends/rtl2832.c
+++ b/drivers/media/dvb-frontends/rtl2832.c
@@ -1125,8 +1125,8 @@ static void rtl2832_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id rtl2832_id_table[] = {
-       { "rtl2832" },
-       {}
+       { .name = "rtl2832" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, rtl2832_id_table);
 

diff --git a/drivers/media/dvb-frontends/si2165.c b/drivers/media/dvb-frontends/si2165.c
index 4170696af9f05caa2a3f974c3b3e9ac280e3aad8..f1241b63aa5ceabd63f25641d80170c022113a79 100644 (file)
--- a/drivers/media/dvb-frontends/si2165.c
+++ b/drivers/media/dvb-frontends/si2165.c
@@ -1281,8 +1281,8 @@ static void si2165_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id si2165_id_table[] = {
-       { "si2165" },
-       {}
+       { .name = "si2165" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, si2165_id_table);
 

diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
index 9c5bac8cda477c79a8d55b4cd3b6c650a5f5d4ad..8bc3b6eb1dd3b53712c3a19411fb8c44b326e783 100644 (file)
--- a/drivers/media/dvb-frontends/si2168.c
+++ b/drivers/media/dvb-frontends/si2168.c
@@ -790,8 +790,8 @@ static void si2168_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id si2168_id_table[] = {
-       { "si2168" },
-       {}
+       { .name = "si2168" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, si2168_id_table);
 

diff --git a/drivers/media/dvb-frontends/sp2.c b/drivers/media/dvb-frontends/sp2.c
index 071c7371c699f3d2dababf19055e12bd75394847..63dec4b4fd2fe7b346469c94047dc3aef525f281 100644 (file)
--- a/drivers/media/dvb-frontends/sp2.c
+++ b/drivers/media/dvb-frontends/sp2.c
@@ -407,8 +407,8 @@ static void sp2_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id sp2_id[] = {
-       { "sp2" },
-       {}
+       { .name = "sp2" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, sp2_id);
 

diff --git a/drivers/media/dvb-frontends/stv090x.c b/drivers/media/dvb-frontends/stv090x.c
index 657df713865e60e802cabc99e5fcd2095831300a..932bbed5497aa6c71aa70e181e962e83c7bc7f88 100644 (file)
--- a/drivers/media/dvb-frontends/stv090x.c
+++ b/drivers/media/dvb-frontends/stv090x.c
@@ -5079,8 +5079,8 @@ error:
 EXPORT_SYMBOL_GPL(stv090x_attach);
 
 static const struct i2c_device_id stv090x_id_table[] = {
-       { "stv090x" },
-       {}
+       { .name = "stv090x" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, stv090x_id_table);
 

diff --git a/drivers/media/dvb-frontends/stv6110x.c b/drivers/media/dvb-frontends/stv6110x.c
index 7506f39ead55d65c2d33935ea90919d550c1ec74..5075333d7ffcdaa0835f6a7b99a7522ec71bc321 100644 (file)
--- a/drivers/media/dvb-frontends/stv6110x.c
+++ b/drivers/media/dvb-frontends/stv6110x.c
@@ -470,8 +470,8 @@ const struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
 EXPORT_SYMBOL_GPL(stv6110x_attach);
 
 static const struct i2c_device_id stv6110x_id_table[] = {
-       { "stv6110x" },
-       {}
+       { .name = "stv6110x" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, stv6110x_id_table);
 

diff --git a/drivers/media/dvb-frontends/tc90522.c b/drivers/media/dvb-frontends/tc90522.c
index f1343ba67b970332e8b48434896ec2807dad674b..9a5ffb5f70fc00ad9ea276c759e0142b641adcc2 100644 (file)
--- a/drivers/media/dvb-frontends/tc90522.c
+++ b/drivers/media/dvb-frontends/tc90522.c
@@ -830,9 +830,9 @@ static void tc90522_remove(struct i2c_client *client)
 
 
 static const struct i2c_device_id tc90522_id[] = {
-       { TC90522_I2C_DEV_SAT, 0 },
-       { TC90522_I2C_DEV_TER, 1 },
-       {}
+       { .name = TC90522_I2C_DEV_SAT, .driver_data = 0 },
+       { .name = TC90522_I2C_DEV_TER, .driver_data = 1 },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, tc90522_id);
 

diff --git a/drivers/media/dvb-frontends/tda10071.c b/drivers/media/dvb-frontends/tda10071.c
index 6e6c2e5c427e7cf093ea5b9bf01bd2bac05bf4c2..7a635c86b86cc2024cf355e8796cefacdabfd458 100644 (file)
--- a/drivers/media/dvb-frontends/tda10071.c
+++ b/drivers/media/dvb-frontends/tda10071.c
@@ -1230,8 +1230,8 @@ static void tda10071_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id tda10071_id_table[] = {
-       { "tda10071_cx24118" },
-       {}
+       { .name = "tda10071_cx24118" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, tda10071_id_table);
 

diff --git a/drivers/media/dvb-frontends/ts2020.c b/drivers/media/dvb-frontends/ts2020.c
index 8b6006635e491bd97cb622b843fc32ce2e567480..8775083f4dd6ea36e8f39172473655fe1230d94b 100644 (file)
--- a/drivers/media/dvb-frontends/ts2020.c
+++ b/drivers/media/dvb-frontends/ts2020.c
@@ -716,9 +716,9 @@ static void ts2020_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ts2020_id_table[] = {
-       { "ts2020" },
-       { "ts2022" },
-       {}
+       { .name = "ts2020" },
+       { .name = "ts2022" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, ts2020_id_table);
 

diff --git a/drivers/media/i2c/ad5820.c b/drivers/media/i2c/ad5820.c
index f60271082fb5b0a80c2814d69decec2baf229f7a..fcce2857b69efd5bab577be5b8ac7cd7e1ccd77c 100644 (file)
--- a/drivers/media/i2c/ad5820.c
+++ b/drivers/media/i2c/ad5820.c
@@ -347,8 +347,8 @@ static void ad5820_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ad5820_id_table[] = {
-       { "ad5820" },
-       { "ad5821" },
+       { .name = "ad5820" },
+       { .name = "ad5821" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, ad5820_id_table);

diff --git a/drivers/media/i2c/adp1653.c b/drivers/media/i2c/adp1653.c
index 391bc75bfcd0f68222fbea75aabb99ed8a90125e..177a6e8d7fb8bd3a53125ce5bbede96a20a1eedb 100644 (file)
--- a/drivers/media/i2c/adp1653.c
+++ b/drivers/media/i2c/adp1653.c
@@ -522,7 +522,7 @@ static void adp1653_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id adp1653_id_table[] = {
-       { ADP1653_NAME },
+       { .name = ADP1653_NAME },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, adp1653_id_table);

diff --git a/drivers/media/i2c/adv7170.c b/drivers/media/i2c/adv7170.c
index ef8682b980b44e4fa38a1028c324d8bb483e6f9c..812998729207bec2c73d915724be4b083f8eef92 100644 (file)
--- a/drivers/media/i2c/adv7170.c
+++ b/drivers/media/i2c/adv7170.c
@@ -377,8 +377,8 @@ static void adv7170_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id adv7170_id[] = {
-       { "adv7170" },
-       { "adv7171" },
+       { .name = "adv7170" },
+       { .name = "adv7171" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, adv7170_id);

diff --git a/drivers/media/i2c/adv7175.c b/drivers/media/i2c/adv7175.c
index 384da1ec5bf9d7492e29abc17850023178315eae..f1caab8e2abd95bcb5f8a2999e8d4af39463d075 100644 (file)
--- a/drivers/media/i2c/adv7175.c
+++ b/drivers/media/i2c/adv7175.c
@@ -432,8 +432,8 @@ static void adv7175_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id adv7175_id[] = {
-       { "adv7175" },
-       { "adv7176" },
+       { .name = "adv7175" },
+       { .name = "adv7176" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, adv7175_id);

diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
index 669b0b3165b1c814ae1ae542f75ca3e21f4ca738..e5d11a6e6766d2e63a2df7025d1e7625bd5c3292 100644 (file)
--- a/drivers/media/i2c/adv7180.c
+++ b/drivers/media/i2c/adv7180.c
@@ -1626,18 +1626,18 @@ static SIMPLE_DEV_PM_OPS(adv7180_pm_ops, adv7180_suspend, adv7180_resume);
 #endif
 
 static const struct i2c_device_id adv7180_id[] = {
-       { "adv7180", (kernel_ulong_t)&adv7180_info },
-       { "adv7180cp", (kernel_ulong_t)&adv7180_info },
-       { "adv7180st", (kernel_ulong_t)&adv7180_info },
-       { "adv7182", (kernel_ulong_t)&adv7182_info },
-       { "adv7280", (kernel_ulong_t)&adv7280_info },
-       { "adv7280-m", (kernel_ulong_t)&adv7280_m_info },
-       { "adv7281", (kernel_ulong_t)&adv7281_info },
-       { "adv7281-m", (kernel_ulong_t)&adv7281_m_info },
-       { "adv7281-ma", (kernel_ulong_t)&adv7281_ma_info },
-       { "adv7282", (kernel_ulong_t)&adv7282_info },
-       { "adv7282-m", (kernel_ulong_t)&adv7282_m_info },
-       {}
+       { .name = "adv7180", .driver_data = (kernel_ulong_t)&adv7180_info },
+       { .name = "adv7180cp", .driver_data = (kernel_ulong_t)&adv7180_info },
+       { .name = "adv7180st", .driver_data = (kernel_ulong_t)&adv7180_info },
+       { .name = "adv7182", .driver_data = (kernel_ulong_t)&adv7182_info },
+       { .name = "adv7280", .driver_data = (kernel_ulong_t)&adv7280_info },
+       { .name = "adv7280-m", .driver_data = (kernel_ulong_t)&adv7280_m_info },
+       { .name = "adv7281", .driver_data = (kernel_ulong_t)&adv7281_info },
+       { .name = "adv7281-m", .driver_data = (kernel_ulong_t)&adv7281_m_info },
+       { .name = "adv7281-ma", .driver_data = (kernel_ulong_t)&adv7281_ma_info },
+       { .name = "adv7282", .driver_data = (kernel_ulong_t)&adv7282_info },
+       { .name = "adv7282-m", .driver_data = (kernel_ulong_t)&adv7282_m_info },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, adv7180_id);
 

diff --git a/drivers/media/i2c/adv7183.c b/drivers/media/i2c/adv7183.c
index 25a31a6dd456de711939e9fcd132323ebb94f50d..a04a1a205fe0d6b6717cfcccabb97b8c58ecb1b4 100644 (file)
--- a/drivers/media/i2c/adv7183.c
+++ b/drivers/media/i2c/adv7183.c
@@ -619,8 +619,8 @@ static void adv7183_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id adv7183_id[] = {
-       { "adv7183" },
-       {}
+       { .name = "adv7183" },
+       { }
 };
 
 MODULE_DEVICE_TABLE(i2c, adv7183_id);

diff --git a/drivers/media/i2c/adv7343.c b/drivers/media/i2c/adv7343.c
index b96443404a2691481b6077a11467fd93103a3645..9b91d7073d3c8eeae63c3179898bc4a521d97399 100644 (file)
--- a/drivers/media/i2c/adv7343.c
+++ b/drivers/media/i2c/adv7343.c
@@ -502,8 +502,8 @@ static void adv7343_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id adv7343_id[] = {
-       { "adv7343" },
-       {}
+       { .name = "adv7343" },
+       { }
 };
 
 MODULE_DEVICE_TABLE(i2c, adv7343_id);

diff --git a/drivers/media/i2c/adv7393.c b/drivers/media/i2c/adv7393.c
index c7994bd0bbd46658f12124a3d9d0de39e25dddcc..6f948ba02f8646cfcb2446e24ca2dd131012e461 100644 (file)
--- a/drivers/media/i2c/adv7393.c
+++ b/drivers/media/i2c/adv7393.c
@@ -446,8 +446,8 @@ static void adv7393_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id adv7393_id[] = {
-       { "adv7393" },
-       {}
+       { .name = "adv7393" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, adv7393_id);
 

diff --git a/drivers/media/i2c/adv7511-v4l2.c b/drivers/media/i2c/adv7511-v4l2.c
index 853c7806de928da2129f603e7cb673440a1fcfac..860cff50c522d0fb9d8743dccad26f1994eb7987 100644 (file)
--- a/drivers/media/i2c/adv7511-v4l2.c
+++ b/drivers/media/i2c/adv7511-v4l2.c
@@ -2008,7 +2008,7 @@ static void adv7511_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id adv7511_id[] = {
-       { "adv7511-v4l2" },
+       { .name = "adv7511-v4l2" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, adv7511_id);

diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index ae75982fb514514ce684554cff739cbdd4072c72..ac9c69ce438f1d5b93bc1cc369ba8caa4d9b5b6d 100644 (file)
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -3236,10 +3236,10 @@ static const struct adv76xx_chip_info adv76xx_chip_info[] = {
 };
 
 static const struct i2c_device_id adv76xx_i2c_id[] = {
-       { "adv7604", (kernel_ulong_t)&adv76xx_chip_info[ADV7604] },
-       { "adv7610", (kernel_ulong_t)&adv76xx_chip_info[ADV7611] },
-       { "adv7611", (kernel_ulong_t)&adv76xx_chip_info[ADV7611] },
-       { "adv7612", (kernel_ulong_t)&adv76xx_chip_info[ADV7612] },
+       { .name = "adv7604", .driver_data = (kernel_ulong_t)&adv76xx_chip_info[ADV7604] },
+       { .name = "adv7610", .driver_data = (kernel_ulong_t)&adv76xx_chip_info[ADV7611] },
+       { .name = "adv7611", .driver_data = (kernel_ulong_t)&adv76xx_chip_info[ADV7611] },
+       { .name = "adv7612", .driver_data = (kernel_ulong_t)&adv76xx_chip_info[ADV7612] },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, adv76xx_i2c_id);

diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c
index ea6966c0605e5b0cab81748829a527de0d381534..3cfae89ce944a21db77c5e9d2241c61ec7679932 100644 (file)
--- a/drivers/media/i2c/adv7842.c
+++ b/drivers/media/i2c/adv7842.c
@@ -3675,7 +3675,7 @@ static void adv7842_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id adv7842_id[] = {
-       { "adv7842" },
+       { .name = "adv7842" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, adv7842_id);

diff --git a/drivers/media/i2c/ak881x.c b/drivers/media/i2c/ak881x.c
index ee575d01a67613642bfdfc00b2bbec32b39cef0a..cea46f01997da1af47a8f81e484cdb4fa204dfb0 100644 (file)
--- a/drivers/media/i2c/ak881x.c
+++ b/drivers/media/i2c/ak881x.c
@@ -304,8 +304,8 @@ static void ak881x_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ak881x_id[] = {
-       { "ak8813" },
-       { "ak8814" },
+       { .name = "ak8813" },
+       { .name = "ak8814" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, ak881x_id);

diff --git a/drivers/media/i2c/bt819.c b/drivers/media/i2c/bt819.c
index f97245f91f8814f094e003a7624e7ae6578c8650..da44100062fa2d4af753b0402819a1deadc44ada 100644 (file)
--- a/drivers/media/i2c/bt819.c
+++ b/drivers/media/i2c/bt819.c
@@ -457,9 +457,9 @@ static void bt819_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id bt819_id[] = {
-       { "bt819a" },
-       { "bt817a" },
-       { "bt815a" },
+       { .name = "bt819a" },
+       { .name = "bt817a" },
+       { .name = "bt815a" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, bt819_id);

diff --git a/drivers/media/i2c/bt856.c b/drivers/media/i2c/bt856.c
index 6852aa47cafba07127bc47a4fa86ebdcfcac42c1..656719158bb459a4319fe366a59f5da954939566 100644 (file)
--- a/drivers/media/i2c/bt856.c
+++ b/drivers/media/i2c/bt856.c
@@ -230,7 +230,7 @@ static void bt856_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id bt856_id[] = {
-       { "bt856" },
+       { .name = "bt856" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, bt856_id);

diff --git a/drivers/media/i2c/bt866.c b/drivers/media/i2c/bt866.c
index a2cc34d35ed24db6010d084093cdde335aa2819e..f5104c7d9f900b147a1450f1b051cb317fa32207 100644 (file)
--- a/drivers/media/i2c/bt866.c
+++ b/drivers/media/i2c/bt866.c
@@ -197,7 +197,7 @@ static void bt866_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id bt866_id[] = {
-       { "bt866" },
+       { .name = "bt866" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, bt866_id);

diff --git a/drivers/media/i2c/cs3308.c b/drivers/media/i2c/cs3308.c
index 3f2f993e16a677d267bb2ded31ea4d37baeb0556..ad37aeecf05e5cdb4b1bcfa4b7fbe5a69f092ada 100644 (file)
--- a/drivers/media/i2c/cs3308.c
+++ b/drivers/media/i2c/cs3308.c
@@ -109,7 +109,7 @@ static void cs3308_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id cs3308_id[] = {
-       { "cs3308" },
+       { .name = "cs3308" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, cs3308_id);

diff --git a/drivers/media/i2c/cs5345.c b/drivers/media/i2c/cs5345.c
index 3a9797a50e828b10ad84910824deae3767e59b82..49b8020fbea2941c832423f40c3d5d5e3110cf68 100644 (file)
--- a/drivers/media/i2c/cs5345.c
+++ b/drivers/media/i2c/cs5345.c
@@ -189,7 +189,7 @@ static void cs5345_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id cs5345_id[] = {
-       { "cs5345" },
+       { .name = "cs5345" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, cs5345_id);

diff --git a/drivers/media/i2c/cs53l32a.c b/drivers/media/i2c/cs53l32a.c
index c4cad3293905c364576b25dd6f97a4a2c6602fec..a894dcf6b5a96f8a02150afd3ff7e6042aa34c02 100644 (file)
--- a/drivers/media/i2c/cs53l32a.c
+++ b/drivers/media/i2c/cs53l32a.c
@@ -200,7 +200,7 @@ static void cs53l32a_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id cs53l32a_id[] = {
-       { "cs53l32a" },
+       { .name = "cs53l32a" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, cs53l32a_id);

diff --git a/drivers/media/i2c/cx25840/cx25840-core.c b/drivers/media/i2c/cx25840/cx25840-core.c
index 69d5cc648c0fc69c56c1837c1fe5858eb5c4c546..8110d40931d984e64558584f03399fef4abc08a0 100644 (file)
--- a/drivers/media/i2c/cx25840/cx25840-core.c
+++ b/drivers/media/i2c/cx25840/cx25840-core.c
@@ -3989,7 +3989,7 @@ static void cx25840_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id cx25840_id[] = {
-       { "cx25840" },
+       { .name = "cx25840" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, cx25840_id);

diff --git a/drivers/media/i2c/ds90ub913.c b/drivers/media/i2c/ds90ub913.c
index 49aa5f4a172c0a0787f93921d1f12172fe588f5f..6abb5e324ae190f9fa72d3bd6b2991049196c3e1 100644 (file)
--- a/drivers/media/i2c/ds90ub913.c
+++ b/drivers/media/i2c/ds90ub913.c
@@ -872,8 +872,8 @@ static void ub913_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ub913_id[] = {
-       { "ds90ub913a-q1" },
-       {}
+       { .name = "ds90ub913a-q1" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, ub913_id);
 

diff --git a/drivers/media/i2c/ds90ub953.c b/drivers/media/i2c/ds90ub953.c
index a8ab67f4137f3e9bd7631c48567f0c3a4dd14dd3..d4228e1134ff88015f95b2c4d7cb9f559f8cd32d 100644 (file)
--- a/drivers/media/i2c/ds90ub953.c
+++ b/drivers/media/i2c/ds90ub953.c
@@ -1347,9 +1347,9 @@ static const struct ub953_hw_data ds90ub971_hw = {
 };
 
 static const struct i2c_device_id ub953_id[] = {
-       { "ds90ub953-q1", (kernel_ulong_t)&ds90ub953_hw },
-       { "ds90ub971-q1", (kernel_ulong_t)&ds90ub971_hw },
-       {}
+       { .name = "ds90ub953-q1", .driver_data = (kernel_ulong_t)&ds90ub953_hw },
+       { .name = "ds90ub971-q1", .driver_data = (kernel_ulong_t)&ds90ub971_hw },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, ub953_id);
 

diff --git a/drivers/media/i2c/ds90ub960.c b/drivers/media/i2c/ds90ub960.c
index d50e977cf6ce4c2ff0e2a5ad837fce1cb28266b8..15a9797b47ac9ccf471c6071da4ff6d4855f952a 100644 (file)
--- a/drivers/media/i2c/ds90ub960.c
+++ b/drivers/media/i2c/ds90ub960.c
@@ -5266,10 +5266,10 @@ static const struct ub960_hw_data ds90ub9702_hw = {
 };
 
 static const struct i2c_device_id ub960_id[] = {
-       { "ds90ub954-q1", (kernel_ulong_t)&ds90ub954_hw },
-       { "ds90ub960-q1", (kernel_ulong_t)&ds90ub960_hw },
-       { "ds90ub9702-q1", (kernel_ulong_t)&ds90ub9702_hw },
-       {}
+       { .name = "ds90ub954-q1", .driver_data = (kernel_ulong_t)&ds90ub954_hw },
+       { .name = "ds90ub960-q1", .driver_data = (kernel_ulong_t)&ds90ub960_hw },
+       { .name = "ds90ub9702-q1", .driver_data = (kernel_ulong_t)&ds90ub9702_hw },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, ub960_id);
 

diff --git a/drivers/media/i2c/dw9714.c b/drivers/media/i2c/dw9714.c
index 3288de539452ebae41daa0988b2d52f27a790da7..1d686b1d2fd78f08245ee57d91eec34a0eea406e 100644 (file)
--- a/drivers/media/i2c/dw9714.c
+++ b/drivers/media/i2c/dw9714.c
@@ -307,7 +307,7 @@ static int __maybe_unused dw9714_vcm_resume(struct device *dev)
 }
 
 static const struct i2c_device_id dw9714_id_table[] = {
-       { DW9714_NAME },
+       { .name = DW9714_NAME },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, dw9714_id_table);

diff --git a/drivers/media/i2c/et8ek8/et8ek8_driver.c b/drivers/media/i2c/et8ek8/et8ek8_driver.c
index 50121c3e5b480b6eea3376596abdd3f262ae14b3..738e2801016a6bc6b71fd01ab12afa4217b8ef1a 100644 (file)
--- a/drivers/media/i2c/et8ek8/et8ek8_driver.c
+++ b/drivers/media/i2c/et8ek8/et8ek8_driver.c
@@ -1485,7 +1485,7 @@ static const struct of_device_id et8ek8_of_table[] = {
 MODULE_DEVICE_TABLE(of, et8ek8_of_table);
 
 static const struct i2c_device_id et8ek8_id_table[] = {
-       { ET8EK8_NAME },
+       { .name = ET8EK8_NAME },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, et8ek8_id_table);

diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c
index 241821572e038f64a876dcadb19f9bbe201d4bf2..882dc2e9dd8f2e4ae5567056726df051f2d0b59e 100644 (file)
--- a/drivers/media/i2c/imx274.c
+++ b/drivers/media/i2c/imx274.c
@@ -1913,7 +1913,7 @@ static const struct of_device_id imx274_of_id_table[] = {
 MODULE_DEVICE_TABLE(of, imx274_of_id_table);
 
 static const struct i2c_device_id imx274_id[] = {
-       { "IMX274" },
+       { .name = "IMX274" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, imx274_id);

diff --git a/drivers/media/i2c/ir-kbd-i2c.c b/drivers/media/i2c/ir-kbd-i2c.c
index 60474531700433294d1cc304cf89e35c8b825f5a..f2bf2b354000774b7f26aaf538d6b02cd30c045a 100644 (file)
--- a/drivers/media/i2c/ir-kbd-i2c.c
+++ b/drivers/media/i2c/ir-kbd-i2c.c
@@ -978,10 +978,10 @@ static void ir_remove(struct i2c_client *client)
 
 static const struct i2c_device_id ir_kbd_id[] = {
        /* Generic entry for any IR receiver */
-       { "ir_video", 0 },
+       { .name = "ir_video", .driver_data = 0 },
        /* IR device specific entries should be added here */
-       { "ir_z8f0811_haup", FLAG_TX },
-       { "ir_z8f0811_hdpvr", FLAG_TX | FLAG_HDPVR },
+       { .name = "ir_z8f0811_haup", .driver_data = FLAG_TX },
+       { .name = "ir_z8f0811_hdpvr", .driver_data = FLAG_TX | FLAG_HDPVR },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, ir_kbd_id);

diff --git a/drivers/media/i2c/isl7998x.c b/drivers/media/i2c/isl7998x.c
index 5ffd53e005ee56d3cd0e19110d042da241a5e9b0..a77538d2343c1bd639fe3c02288061daabc0cc44 100644 (file)
--- a/drivers/media/i2c/isl7998x.c
+++ b/drivers/media/i2c/isl7998x.c
@@ -1561,7 +1561,7 @@ static const struct of_device_id isl7998x_of_match[] = {
 MODULE_DEVICE_TABLE(of, isl7998x_of_match);
 
 static const struct i2c_device_id isl7998x_id[] = {
-       { "isl79987" },
+       { .name = "isl79987" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(i2c, isl7998x_id);

diff --git a/drivers/media/i2c/ks0127.c b/drivers/media/i2c/ks0127.c
index f3fba9179684e39949975a959759266ae19680f9..8c66be38adc305758602e12e23b067858786836a 100644 (file)
--- a/drivers/media/i2c/ks0127.c
+++ b/drivers/media/i2c/ks0127.c
@@ -677,9 +677,9 @@ static void ks0127_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ks0127_id[] = {
-       { "ks0127" },
-       { "ks0127b" },
-       { "ks0122s" },
+       { .name = "ks0127" },
+       { .name = "ks0127b" },
+       { .name = "ks0122s" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, ks0127_id);

diff --git a/drivers/media/i2c/lm3560.c b/drivers/media/i2c/lm3560.c
index 46d316a26e50265cb4bd488028e17aa644b9bb96..c3c90d830ee24d2787f6cdc554cf3e81b24490b6 100644 (file)
--- a/drivers/media/i2c/lm3560.c
+++ b/drivers/media/i2c/lm3560.c
@@ -704,8 +704,8 @@ static const struct of_device_id lm3560_of_match[] = {
 MODULE_DEVICE_TABLE(of, lm3560_of_match);
 
 static const struct i2c_device_id lm3560_id_table[] = {
-       { "lm3559", (kernel_ulong_t)&lm3559_config },
-       { "lm3560", (kernel_ulong_t)&lm3560_config },
+       { .name = "lm3559", .driver_data = (kernel_ulong_t)&lm3559_config },
+       { .name = "lm3560", .driver_data = (kernel_ulong_t)&lm3560_config },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, lm3560_id_table);

diff --git a/drivers/media/i2c/lm3646.c b/drivers/media/i2c/lm3646.c
index 2d16e42ec224e28a71f38a4038aac56cbb1e4290..9030cbe32afca1e45281942f03a2437878b49dad 100644 (file)
--- a/drivers/media/i2c/lm3646.c
+++ b/drivers/media/i2c/lm3646.c
@@ -386,8 +386,8 @@ static void lm3646_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id lm3646_id_table[] = {
-       { LM3646_NAME },
-       {}
+       { .name = LM3646_NAME },
+       { }
 };
 
 MODULE_DEVICE_TABLE(i2c, lm3646_id_table);

diff --git a/drivers/media/i2c/m52790.c b/drivers/media/i2c/m52790.c
index 9e1ecfd01e2a7f0ca752ec12676c7021a271a015..f3adf8c2b27f1f7d963775351630dfc6aeb30a40 100644 (file)
--- a/drivers/media/i2c/m52790.c
+++ b/drivers/media/i2c/m52790.c
@@ -163,7 +163,7 @@ static void m52790_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id m52790_id[] = {
-       { "m52790" },
+       { .name = "m52790" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, m52790_id);

diff --git a/drivers/media/i2c/max2175.c b/drivers/media/i2c/max2175.c
index bf02ca23a284c035a565932b0a2bb4c1a8d32a69..1cc388b52902cd50dfa3f04ebe28ff08e1d21864 100644 (file)
--- a/drivers/media/i2c/max2175.c
+++ b/drivers/media/i2c/max2175.c
@@ -1413,8 +1413,8 @@ static void max2175_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id max2175_id[] = {
-       { DRIVER_NAME },
-       {}
+       { .name = DRIVER_NAME },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, max2175_id);
 

diff --git a/drivers/media/i2c/ml86v7667.c b/drivers/media/i2c/ml86v7667.c
index 57ba3693649abe34429d7880da9dcd95d1e1760d..48b7d589df3180f0a46a5578e0f199dc47677479 100644 (file)
--- a/drivers/media/i2c/ml86v7667.c
+++ b/drivers/media/i2c/ml86v7667.c
@@ -424,8 +424,8 @@ static void ml86v7667_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ml86v7667_id[] = {
-       { DRV_NAME },
-       {}
+       { .name = DRV_NAME },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, ml86v7667_id);
 

diff --git a/drivers/media/i2c/msp3400-driver.c b/drivers/media/i2c/msp3400-driver.c
index 4c0b0ad68c084e7a5d46fa08b4f182fe28805b01..413cfbc2dd94e6e27394623530b4d95d8ae03382 100644 (file)
--- a/drivers/media/i2c/msp3400-driver.c
+++ b/drivers/media/i2c/msp3400-driver.c
@@ -874,7 +874,7 @@ static const struct dev_pm_ops msp3400_pm_ops = {
 };
 
 static const struct i2c_device_id msp_id[] = {
-       { "msp3400" },
+       { .name = "msp3400" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, msp_id);

diff --git a/drivers/media/i2c/mt9m001.c b/drivers/media/i2c/mt9m001.c
index 7a6114d18dfc5c2680791f9d9d0440c96d136c72..0ade967b357bc421359ac8a5e65239de21aa095a 100644 (file)
--- a/drivers/media/i2c/mt9m001.c
+++ b/drivers/media/i2c/mt9m001.c
@@ -855,7 +855,7 @@ static void mt9m001_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id mt9m001_id[] = {
-       { "mt9m001" },
+       { .name = "mt9m001" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, mt9m001_id);

diff --git a/drivers/media/i2c/mt9m111.c b/drivers/media/i2c/mt9m111.c
index 3532c7c38becc21df88957f8f323c77033026a81..4e748080b79868b664ca7338f0850b5329399cc7 100644 (file)
--- a/drivers/media/i2c/mt9m111.c
+++ b/drivers/media/i2c/mt9m111.c
@@ -1384,7 +1384,7 @@ static const struct of_device_id mt9m111_of_match[] = {
 MODULE_DEVICE_TABLE(of, mt9m111_of_match);
 
 static const struct i2c_device_id mt9m111_id[] = {
-       { "mt9m111" },
+       { .name = "mt9m111" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, mt9m111_id);

diff --git a/drivers/media/i2c/mt9t112.c b/drivers/media/i2c/mt9t112.c
index 2d2c840fc00216a77730a816c9ee1e89f9cdcd1b..bd2268154ca7a28a370b26939bb0f23c6c84f4b9 100644 (file)
--- a/drivers/media/i2c/mt9t112.c
+++ b/drivers/media/i2c/mt9t112.c
@@ -1108,7 +1108,7 @@ static void mt9t112_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id mt9t112_id[] = {
-       { "mt9t112" },
+       { .name = "mt9t112" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, mt9t112_id);

diff --git a/drivers/media/i2c/mt9v011.c b/drivers/media/i2c/mt9v011.c
index 055b7915260a23737308e90e9060c29d885a64a3..985517f1cff7e30d79d3be2a0fce3bd37efde072 100644 (file)
--- a/drivers/media/i2c/mt9v011.c
+++ b/drivers/media/i2c/mt9v011.c
@@ -582,7 +582,7 @@ static void mt9v011_remove(struct i2c_client *c)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id mt9v011_id[] = {
-       { "mt9v011" },
+       { .name = "mt9v011" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, mt9v011_id);

diff --git a/drivers/media/i2c/ov13858.c b/drivers/media/i2c/ov13858.c
index 162b49046990a1dcd156c5b6ed5625949ac54835..09d58e8b1c7fbdbe41aba9a97ee8054a89830fd1 100644 (file)
--- a/drivers/media/i2c/ov13858.c
+++ b/drivers/media/i2c/ov13858.c
@@ -1747,8 +1747,8 @@ static void ov13858_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ov13858_id_table[] = {
-       { "ov13858" },
-       {}
+       { .name = "ov13858" },
+       { }
 };
 
 MODULE_DEVICE_TABLE(i2c, ov13858_id_table);

diff --git a/drivers/media/i2c/ov2640.c b/drivers/media/i2c/ov2640.c
index d27fc2df64e6d8f107e56bb9945a9371a90fddd8..50feb608b92b642597d4288a041c2ea1b4eec7c5 100644 (file)
--- a/drivers/media/i2c/ov2640.c
+++ b/drivers/media/i2c/ov2640.c
@@ -1271,7 +1271,7 @@ static void ov2640_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ov2640_id[] = {
-       { "ov2640" },
+       { .name = "ov2640" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, ov2640_id);

diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c
index 061401b020fcb48157d229908967709e59fe3019..7d8c7c3465a4cf5c688e92e108ed8126fca795ec 100644 (file)
--- a/drivers/media/i2c/ov2659.c
+++ b/drivers/media/i2c/ov2659.c
@@ -1553,7 +1553,7 @@ static const struct dev_pm_ops ov2659_pm_ops = {
 };
 
 static const struct i2c_device_id ov2659_id[] = {
-       { "ov2659" },
+       { .name = "ov2659" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(i2c, ov2659_id);

diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index 85ecc23b358771f93d65c6b0ef7eef1aee651091..92d2d6cd4ba486260a8d3f630bbf0e620bee3ab1 100644 (file)
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -3999,8 +3999,8 @@ static const struct dev_pm_ops ov5640_pm_ops = {
 };
 
 static const struct i2c_device_id ov5640_id[] = {
-       { "ov5640" },
-       {}
+       { .name = "ov5640" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, ov5640_id);
 

diff --git a/drivers/media/i2c/ov5645.c b/drivers/media/i2c/ov5645.c
index b10d408034a184835207ac488b0830397e1f6521..c772ef6e51d20081d5885917d6e6d2e237e20490 100644 (file)
--- a/drivers/media/i2c/ov5645.c
+++ b/drivers/media/i2c/ov5645.c
@@ -1219,8 +1219,8 @@ static void ov5645_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ov5645_id[] = {
-       { "ov5645" },
-       {}
+       { .name = "ov5645" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, ov5645_id);
 

diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
index db9bd2892140de23948670366ed1d44e661bae9b..3facf92b3841e69a204ba4e2aed0bdcac7274b9f 100644 (file)
--- a/drivers/media/i2c/ov5647.c
+++ b/drivers/media/i2c/ov5647.c
@@ -1278,7 +1278,7 @@ static const struct dev_pm_ops ov5647_pm_ops = {
 };
 
 static const struct i2c_device_id ov5647_id[] = {
-       { "ov5647" },
+       { .name = "ov5647" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(i2c, ov5647_id);

diff --git a/drivers/media/i2c/ov7640.c b/drivers/media/i2c/ov7640.c
index 9f68d89936eb76b60ec238d0be72dd704df96841..0fd90bc67e29db91760c9b0b2e7272c67f211250 100644 (file)
--- a/drivers/media/i2c/ov7640.c
+++ b/drivers/media/i2c/ov7640.c
@@ -77,7 +77,7 @@ static void ov7640_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ov7640_id[] = {
-       { "ov7640" },
+       { .name = "ov7640" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, ov7640_id);

diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
index 0cb96b6c99905c3b9112568671c8e047c9723876..b6d238ba0d53fc575746a5042794d181ef262490 100644 (file)
--- a/drivers/media/i2c/ov7670.c
+++ b/drivers/media/i2c/ov7670.c
@@ -1997,8 +1997,8 @@ static const struct ov7670_devtype ov7675_devdata = {
 };
 
 static const struct i2c_device_id ov7670_id[] = {
-       { "ov7670", (kernel_ulong_t)&ov7670_devdata },
-       { "ov7675", (kernel_ulong_t)&ov7675_devdata },
+       { .name = "ov7670", .driver_data = (kernel_ulong_t)&ov7670_devdata },
+       { .name = "ov7675", .driver_data = (kernel_ulong_t)&ov7675_devdata },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(i2c, ov7670_id);

diff --git a/drivers/media/i2c/ov772x.c b/drivers/media/i2c/ov772x.c
index 062e1023a411ea50ac0dcff9e324b4f8992e5636..be3ba284ee0ba2f6e18f6aa8119e585016d22c23 100644 (file)
--- a/drivers/media/i2c/ov772x.c
+++ b/drivers/media/i2c/ov772x.c
@@ -1546,7 +1546,7 @@ static void ov772x_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ov772x_id[] = {
-       { "ov772x" },
+       { .name = "ov772x" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, ov772x_id);

diff --git a/drivers/media/i2c/ov7740.c b/drivers/media/i2c/ov7740.c
index 632fb80469bef6479862b4db1cbf03fd8fb52656..c2e02f19181697cbaf1eaf72a6634ebac8f3a1e5 100644 (file)
--- a/drivers/media/i2c/ov7740.c
+++ b/drivers/media/i2c/ov7740.c
@@ -1149,7 +1149,7 @@ static int __maybe_unused ov7740_runtime_resume(struct device *dev)
 }
 
 static const struct i2c_device_id ov7740_id[] = {
-       { "ov7740" },
+       { .name = "ov7740" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(i2c, ov7740_id);

diff --git a/drivers/media/i2c/ov9640.c b/drivers/media/i2c/ov9640.c
index 2190c52b143326d1537bf70bad3fba1cdd2345d5..122f411044ce50ea48a17f5de453ca93e93db9d9 100644 (file)
--- a/drivers/media/i2c/ov9640.c
+++ b/drivers/media/i2c/ov9640.c
@@ -752,7 +752,7 @@ static void ov9640_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ov9640_id[] = {
-       { "ov9640" },
+       { .name = "ov9640" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, ov9640_id);

diff --git a/drivers/media/i2c/ov9650.c b/drivers/media/i2c/ov9650.c
index c94e8fe29f226cc0bb799b425fe45c194cd25062..5c85db8a4a3836c3cbdb0697902e0f05373e0b45 100644 (file)
--- a/drivers/media/i2c/ov9650.c
+++ b/drivers/media/i2c/ov9650.c
@@ -1567,8 +1567,8 @@ static void ov965x_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ov965x_id[] = {
-       { "OV9650" },
-       { "OV9652" },
+       { .name = "OV9650" },
+       { .name = "OV9652" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(i2c, ov965x_id);

diff --git a/drivers/media/i2c/rj54n1cb0c.c b/drivers/media/i2c/rj54n1cb0c.c
index e95342d706c39a853e8c18de1ce447a5fa508565..23352d71a108d5af3eb6dce9af55327cdfe70ef3 100644 (file)
--- a/drivers/media/i2c/rj54n1cb0c.c
+++ b/drivers/media/i2c/rj54n1cb0c.c
@@ -1413,7 +1413,7 @@ static void rj54n1_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id rj54n1_id[] = {
-       { "rj54n1cb0c" },
+       { .name = "rj54n1cb0c" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, rj54n1_id);

diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
index ab31ee2b596b214f982889cbfff051b5ff687b80..551387cea521e56c2a66f0bc37b22171ef91626d 100644 (file)
--- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
+++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
@@ -1728,7 +1728,7 @@ static void s5c73m3_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id s5c73m3_id[] = {
-       { DRIVER_NAME },
+       { .name = DRIVER_NAME },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, s5c73m3_id);

diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
index d1d00eca870838d86ca6a283780d2485b848392f..378d273055eec498893d1723448ccdd6686be985 100644 (file)
--- a/drivers/media/i2c/s5k5baf.c
+++ b/drivers/media/i2c/s5k5baf.c
@@ -2007,7 +2007,7 @@ static void s5k5baf_remove(struct i2c_client *c)
 }
 
 static const struct i2c_device_id s5k5baf_id[] = {
-       { S5K5BAF_DRIVER_NAME },
+       { .name = S5K5BAF_DRIVER_NAME },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, s5k5baf_id);

diff --git a/drivers/media/i2c/saa6588.c b/drivers/media/i2c/saa6588.c
index 90ae4121a68a745d7a6ebe4fb6db73cf24eb5869..56bfa3d2604b4c104dc57bf999085de344b41a3f 100644 (file)
--- a/drivers/media/i2c/saa6588.c
+++ b/drivers/media/i2c/saa6588.c
@@ -495,7 +495,7 @@ static void saa6588_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id saa6588_id[] = {
-       { "saa6588" },
+       { .name = "saa6588" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, saa6588_id);

diff --git a/drivers/media/i2c/saa6752hs.c b/drivers/media/i2c/saa6752hs.c
index 1c0031ba43b44f5eac3043700eea5a8e68c36661..c6bf0b0902e843f19c70b851ccc6844c2f34e45d 100644 (file)
--- a/drivers/media/i2c/saa6752hs.c
+++ b/drivers/media/i2c/saa6752hs.c
@@ -770,7 +770,7 @@ static void saa6752hs_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id saa6752hs_id[] = {
-       { "saa6752hs" },
+       { .name = "saa6752hs" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, saa6752hs_id);

diff --git a/drivers/media/i2c/saa7110.c b/drivers/media/i2c/saa7110.c
index 942aeeb40c524f47aa2fab6bda76d7bca5f0e2b2..652058b8f76600ed661d3d956ed10ac9918987af 100644 (file)
--- a/drivers/media/i2c/saa7110.c
+++ b/drivers/media/i2c/saa7110.c
@@ -439,7 +439,7 @@ static void saa7110_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id saa7110_id[] = {
-       { "saa7110" },
+       { .name = "saa7110" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, saa7110_id);

diff --git a/drivers/media/i2c/saa7115.c b/drivers/media/i2c/saa7115.c
index 48d6730d927144e657374ebe8d1bb9efbc7b5277..7cce90750c9342b1f7591b6f27f5b5d37e7fa958 100644 (file)
--- a/drivers/media/i2c/saa7115.c
+++ b/drivers/media/i2c/saa7115.c
@@ -1928,13 +1928,13 @@ static void saa711x_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id saa711x_id[] = {
-       { "saa7115_auto", 1 }, /* autodetect */
-       { "saa7111", 0 },
-       { "saa7113", 0 },
-       { "saa7114", 0 },
-       { "saa7115", 0 },
-       { "saa7118", 0 },
-       { "gm7113c", 0 },
+       { .name = "saa7115_auto", .driver_data = 1 }, /* autodetect */
+       { .name = "saa7111", .driver_data = 0 },
+       { .name = "saa7113", .driver_data = 0 },
+       { .name = "saa7114", .driver_data = 0 },
+       { .name = "saa7115", .driver_data = 0 },
+       { .name = "saa7118", .driver_data = 0 },
+       { .name = "gm7113c", .driver_data = 0 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, saa711x_id);

diff --git a/drivers/media/i2c/saa7127.c b/drivers/media/i2c/saa7127.c
index a42a7ffe37684855d145a1ff1ba32745e7759418..fdf17f6fae67981992ae2519637ae0b88e846d40 100644 (file)
--- a/drivers/media/i2c/saa7127.c
+++ b/drivers/media/i2c/saa7127.c
@@ -797,11 +797,11 @@ static void saa7127_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id saa7127_id[] = {
-       { "saa7127_auto", 0 },  /* auto-detection */
-       { "saa7126", SAA7127 },
-       { "saa7127", SAA7127 },
-       { "saa7128", SAA7129 },
-       { "saa7129", SAA7129 },
+       { .name = "saa7127_auto", .driver_data = 0 },   /* auto-detection */
+       { .name = "saa7126", .driver_data = SAA7127 },
+       { .name = "saa7127", .driver_data = SAA7127 },
+       { .name = "saa7128", .driver_data = SAA7129 },
+       { .name = "saa7129", .driver_data = SAA7129 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, saa7127_id);

diff --git a/drivers/media/i2c/saa717x.c b/drivers/media/i2c/saa717x.c
index 713331be947c3363e260c26a8efb499e8c840c52..0536ceb546506736c7940d40edb3c207ea361919 100644 (file)
--- a/drivers/media/i2c/saa717x.c
+++ b/drivers/media/i2c/saa717x.c
@@ -1334,7 +1334,7 @@ static void saa717x_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id saa717x_id[] = {
-       { "saa717x" },
+       { .name = "saa717x" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, saa717x_id);

diff --git a/drivers/media/i2c/saa7185.c b/drivers/media/i2c/saa7185.c
index c04e452a332bc294bb53346fd1ce0230be6ba7a7..8e5c0eab907db3fb2d7d0eec8850a84e64e10b7c 100644 (file)
--- a/drivers/media/i2c/saa7185.c
+++ b/drivers/media/i2c/saa7185.c
@@ -334,7 +334,7 @@ static void saa7185_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id saa7185_id[] = {
-       { "saa7185" },
+       { .name = "saa7185" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, saa7185_id);

diff --git a/drivers/media/i2c/sony-btf-mpx.c b/drivers/media/i2c/sony-btf-mpx.c
index 16072a9f82477040d7b6e469678997586e56050d..4c87de0fe1f0ad10bd97c9e6ecadae4d5d8e0e6a 100644 (file)
--- a/drivers/media/i2c/sony-btf-mpx.c
+++ b/drivers/media/i2c/sony-btf-mpx.c
@@ -366,7 +366,7 @@ static void sony_btf_mpx_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id sony_btf_mpx_id[] = {
-       { "sony-btf-mpx" },
+       { .name = "sony-btf-mpx" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, sony_btf_mpx_id);

diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
index a0ca19359c43145988535d7816012ef607555b87..fbd38bbfee038552238209d3e070283800f1553a 100644 (file)
--- a/drivers/media/i2c/tc358743.c
+++ b/drivers/media/i2c/tc358743.c
@@ -2358,8 +2358,8 @@ static void tc358743_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id tc358743_id[] = {
-       { "tc358743" },
-       {}
+       { .name = "tc358743" },
+       { }
 };
 
 MODULE_DEVICE_TABLE(i2c, tc358743_id);

diff --git a/drivers/media/i2c/tda1997x.c b/drivers/media/i2c/tda1997x.c
index 5c6dda5338f5f9a60d504d6c9f7e1ead32e7164a..afa1d6f34c9c56aea2f4f2fbcd6252a04bc293e3 100644 (file)
--- a/drivers/media/i2c/tda1997x.c
+++ b/drivers/media/i2c/tda1997x.c
@@ -2274,9 +2274,9 @@ static int tda1997x_set_power(struct tda1997x_state *state, bool on)
 }
 
 static const struct i2c_device_id tda1997x_i2c_id[] = {
-       {"tda19971", (kernel_ulong_t)&tda1997x_chip_info[TDA19971]},
-       {"tda19973", (kernel_ulong_t)&tda1997x_chip_info[TDA19973]},
-       { },
+       { .name = "tda19971", .driver_data = (kernel_ulong_t)&tda1997x_chip_info[TDA19971] },
+       { .name = "tda19973", .driver_data = (kernel_ulong_t)&tda1997x_chip_info[TDA19973] },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, tda1997x_i2c_id);
 

diff --git a/drivers/media/i2c/tda7432.c b/drivers/media/i2c/tda7432.c
index 76ef0fdddf76131235f0a2d041c688b88df9dc18..a0b65a595ba8262214bafa7b98f7ab962d4ba114 100644 (file)
--- a/drivers/media/i2c/tda7432.c
+++ b/drivers/media/i2c/tda7432.c
@@ -400,7 +400,7 @@ static void tda7432_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id tda7432_id[] = {
-       { "tda7432" },
+       { .name = "tda7432" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tda7432_id);

diff --git a/drivers/media/i2c/tda9840.c b/drivers/media/i2c/tda9840.c
index e3b266db571fe377c5a4449b90f23c9deef9db87..b34d992777fbab819ee90083dcf50f9ce2c82b7f 100644 (file)
--- a/drivers/media/i2c/tda9840.c
+++ b/drivers/media/i2c/tda9840.c
@@ -182,7 +182,7 @@ static void tda9840_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id tda9840_id[] = {
-       { "tda9840" },
+       { .name = "tda9840" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tda9840_id);

diff --git a/drivers/media/i2c/tea6415c.c b/drivers/media/i2c/tea6415c.c
index 0cd2e6c52e20846973d93fadccf7e0dea0731140..ea7730a7ee2c1cef57fd7b8fc3ed285d4f61282a 100644 (file)
--- a/drivers/media/i2c/tea6415c.c
+++ b/drivers/media/i2c/tea6415c.c
@@ -141,7 +141,7 @@ static void tea6415c_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id tea6415c_id[] = {
-       { "tea6415c" },
+       { .name = "tea6415c" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tea6415c_id);

diff --git a/drivers/media/i2c/tea6420.c b/drivers/media/i2c/tea6420.c
index 400883fc0c0fec0ad20033636c8b464d59e7df3c..bebb9a8095dbc34538fdbdab952863d670879d69 100644 (file)
--- a/drivers/media/i2c/tea6420.c
+++ b/drivers/media/i2c/tea6420.c
@@ -123,7 +123,7 @@ static void tea6420_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id tea6420_id[] = {
-       { "tea6420" },
+       { .name = "tea6420" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tea6420_id);

diff --git a/drivers/media/i2c/ths7303.c b/drivers/media/i2c/ths7303.c
index ff268ebeb4d93753827fdb8c72469d408b63fdc2..fa5b9c884c1d732a46870d0ecb80d5efcdaec7dd 100644 (file)
--- a/drivers/media/i2c/ths7303.c
+++ b/drivers/media/i2c/ths7303.c
@@ -369,9 +369,9 @@ static void ths7303_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ths7303_id[] = {
-       { "ths7303" },
-       { "ths7353" },
-       {}
+       { .name = "ths7303" },
+       { .name = "ths7353" },
+       { }
 };
 
 MODULE_DEVICE_TABLE(i2c, ths7303_id);

diff --git a/drivers/media/i2c/ths8200.c b/drivers/media/i2c/ths8200.c
index 686f10641c7a6a028abfb8579df8c34478d08089..808ef16ec3b3f4ce3960b27a4f7484d7d04253d2 100644 (file)
--- a/drivers/media/i2c/ths8200.c
+++ b/drivers/media/i2c/ths8200.c
@@ -487,8 +487,8 @@ static void ths8200_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id ths8200_id[] = {
-       { "ths8200" },
-       {}
+       { .name = "ths8200" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, ths8200_id);
 

diff --git a/drivers/media/i2c/tlv320aic23b.c b/drivers/media/i2c/tlv320aic23b.c
index 6f6bc5236565c5b63b598017fdf856bbb01e0876..7deeef31771471a065f1887c779b866b3f22e0a2 100644 (file)
--- a/drivers/media/i2c/tlv320aic23b.c
+++ b/drivers/media/i2c/tlv320aic23b.c
@@ -188,7 +188,7 @@ static void tlv320aic23b_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id tlv320aic23b_id[] = {
-       { "tlv320aic23b" },
+       { .name = "tlv320aic23b" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tlv320aic23b_id);

diff --git a/drivers/media/i2c/tvaudio.c b/drivers/media/i2c/tvaudio.c
index 6267e9ad39c01b9d2c673d8114de1f43b2ab7043..f136310b899d5a06bef7c8934ec4da2a6d616e18 100644 (file)
--- a/drivers/media/i2c/tvaudio.c
+++ b/drivers/media/i2c/tvaudio.c
@@ -2086,7 +2086,7 @@ static void tvaudio_remove(struct i2c_client *client)
    detect which device is present. So rather than listing all supported
    devices here, we pretend to support a single, fake device type. */
 static const struct i2c_device_id tvaudio_id[] = {
-       { "tvaudio" },
+       { .name = "tvaudio" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tvaudio_id);

diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c
index 7af8f37646d698e2ca2b5c286dc7ef89e49195ee..376eecb0b67305f905a0ff873f8d2e5eca983cfd 100644 (file)
--- a/drivers/media/i2c/tvp514x.c
+++ b/drivers/media/i2c/tvp514x.c
@@ -1129,10 +1129,10 @@ static const struct tvp514x_reg tvp514xm_init_reg_seq[] = {
  * driver_data - Driver data
  */
 static const struct i2c_device_id tvp514x_id[] = {
-       {"tvp5146", (kernel_ulong_t)tvp5146_init_reg_seq },
-       {"tvp5146m2", (kernel_ulong_t)tvp514xm_init_reg_seq },
-       {"tvp5147", (kernel_ulong_t)tvp5147_init_reg_seq },
-       {"tvp5147m1", (kernel_ulong_t)tvp514xm_init_reg_seq },
+       { .name = "tvp5146", .driver_data = (kernel_ulong_t)tvp5146_init_reg_seq },
+       { .name = "tvp5146m2", .driver_data = (kernel_ulong_t)tvp514xm_init_reg_seq },
+       { .name = "tvp5147", .driver_data = (kernel_ulong_t)tvp5147_init_reg_seq },
+       { .name = "tvp5147m1", .driver_data = (kernel_ulong_t)tvp514xm_init_reg_seq },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(i2c, tvp514x_id);

diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c
index e3675c744d9edc79685e7d839caf342dda45b2ed..9c204f38935dd3ccb6e5dec9b6cc3c67fdaf26f1 100644 (file)
--- a/drivers/media/i2c/tvp5150.c
+++ b/drivers/media/i2c/tvp5150.c
@@ -2265,7 +2265,7 @@ static const struct dev_pm_ops tvp5150_pm_ops = {
 };
 
 static const struct i2c_device_id tvp5150_id[] = {
-       { "tvp5150" },
+       { .name = "tvp5150" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tvp5150_id);

diff --git a/drivers/media/i2c/tvp7002.c b/drivers/media/i2c/tvp7002.c
index c09a5bd71fd0bb4d2e7d5d26f6c3be74de1b7efa..3979ccde5a954fc3aa7ec16b1504f5e8f7395f3d 100644 (file)
--- a/drivers/media/i2c/tvp7002.c
+++ b/drivers/media/i2c/tvp7002.c
@@ -1070,7 +1070,7 @@ static void tvp7002_remove(struct i2c_client *c)
 
 /* I2C Device ID table */
 static const struct i2c_device_id tvp7002_id[] = {
-       { "tvp7002" },
+       { .name = "tvp7002" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tvp7002_id);

diff --git a/drivers/media/i2c/tw2804.c b/drivers/media/i2c/tw2804.c
index 3d154f4fb5f9dfc31e937027b0b902c8eb7b7c30..713e078ff3dac5fb0262f194ea61b52a1eddfe7c 100644 (file)
--- a/drivers/media/i2c/tw2804.c
+++ b/drivers/media/i2c/tw2804.c
@@ -414,7 +414,7 @@ static void tw2804_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id tw2804_id[] = {
-       { "tw2804" },
+       { .name = "tw2804" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tw2804_id);

diff --git a/drivers/media/i2c/tw9900.c b/drivers/media/i2c/tw9900.c
index 53efdeaed1dba64aa7b55597880612ad887286fa..617fcf7f0b453943ca1787907d37002146c67fc7 100644 (file)
--- a/drivers/media/i2c/tw9900.c
+++ b/drivers/media/i2c/tw9900.c
@@ -753,7 +753,7 @@ static const struct dev_pm_ops tw9900_pm_ops = {
 };
 
 static const struct i2c_device_id tw9900_id[] = {
-       { "tw9900" },
+       { .name = "tw9900" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tw9900_id);

diff --git a/drivers/media/i2c/tw9903.c b/drivers/media/i2c/tw9903.c
index c3eafd5d5dc82041c90fa0d4e9fc43bfacedaf74..db063b885b09c86e8c495f355b14be44c45bc2d3 100644 (file)
--- a/drivers/media/i2c/tw9903.c
+++ b/drivers/media/i2c/tw9903.c
@@ -246,7 +246,7 @@ static void tw9903_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id tw9903_id[] = {
-       { "tw9903" },
+       { .name = "tw9903" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tw9903_id);

diff --git a/drivers/media/i2c/tw9906.c b/drivers/media/i2c/tw9906.c
index 0ab43fe42d7f43a8dcf48bd7e2484d4a3e33c00c..079e2f49f38f30e64d29da8682b0deb183b84b1e 100644 (file)
--- a/drivers/media/i2c/tw9906.c
+++ b/drivers/media/i2c/tw9906.c
@@ -214,7 +214,7 @@ static void tw9906_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id tw9906_id[] = {
-       { "tw9906" },
+       { .name = "tw9906" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tw9906_id);

diff --git a/drivers/media/i2c/tw9910.c b/drivers/media/i2c/tw9910.c
index f3e400304e042e644d87cf924b3ddcded45ec6f5..872207e688bf6c19fc76848bc3b13e2070c1cf24 100644 (file)
--- a/drivers/media/i2c/tw9910.c
+++ b/drivers/media/i2c/tw9910.c
@@ -996,7 +996,7 @@ static void tw9910_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id tw9910_id[] = {
-       { "tw9910" },
+       { .name = "tw9910" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tw9910_id);

diff --git a/drivers/media/i2c/uda1342.c b/drivers/media/i2c/uda1342.c
index 2e4540ee2df2dd81497d033843c164e2b7618599..437726788ba02a2c94a3f35823cdbdf56deb1041 100644 (file)
--- a/drivers/media/i2c/uda1342.c
+++ b/drivers/media/i2c/uda1342.c
@@ -79,7 +79,7 @@ static void uda1342_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id uda1342_id[] = {
-       { "uda1342" },
+       { .name = "uda1342" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, uda1342_id);

diff --git a/drivers/media/i2c/upd64031a.c b/drivers/media/i2c/upd64031a.c
index a178af46e6951df9d9e5c09e448429afa2000f56..670118c168724c8fb70ea56e490ab85d6b0f8764 100644 (file)
--- a/drivers/media/i2c/upd64031a.c
+++ b/drivers/media/i2c/upd64031a.c
@@ -219,7 +219,7 @@ static void upd64031a_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id upd64031a_id[] = {
-       { "upd64031a" },
+       { .name = "upd64031a" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, upd64031a_id);

diff --git a/drivers/media/i2c/upd64083.c b/drivers/media/i2c/upd64083.c
index 5421dc5e32c92d0e94f233874f5e387f6ffb682b..e610dffa9e10ddad35c819cb84f5397835313228 100644 (file)
--- a/drivers/media/i2c/upd64083.c
+++ b/drivers/media/i2c/upd64083.c
@@ -190,7 +190,7 @@ static void upd64083_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id upd64083_id[] = {
-       { "upd64083" },
+       { .name = "upd64083" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, upd64083_id);

diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c
index 2b23914717d17bceb17d9a6e21a8a514cc63ad46..56b99eea54a17351195eef87a9b61006d5eaa125 100644 (file)
--- a/drivers/media/i2c/video-i2c.c
+++ b/drivers/media/i2c/video-i2c.c
@@ -922,9 +922,9 @@ static const struct dev_pm_ops video_i2c_pm_ops = {
 };
 
 static const struct i2c_device_id video_i2c_id_table[] = {
-       { "amg88xx", (kernel_ulong_t)&video_i2c_chip[AMG88XX] },
-       { "mlx90640", (kernel_ulong_t)&video_i2c_chip[MLX90640] },
-       {}
+       { .name = "amg88xx", .driver_data = (kernel_ulong_t)&video_i2c_chip[AMG88XX] },
+       { .name = "mlx90640", .driver_data = (kernel_ulong_t)&video_i2c_chip[MLX90640] },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, video_i2c_id_table);
 

diff --git a/drivers/media/i2c/vp27smpx.c b/drivers/media/i2c/vp27smpx.c
index df21950be24f2b7c9c55050d4a5dc12c70802ec4..21fcfdd4c1630ee754d3c7c9682683eee5ed0d5a 100644 (file)
--- a/drivers/media/i2c/vp27smpx.c
+++ b/drivers/media/i2c/vp27smpx.c
@@ -172,7 +172,7 @@ static void vp27smpx_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static const struct i2c_device_id vp27smpx_id[] = {
-       { "vp27smpx" },
+       { .name = "vp27smpx" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, vp27smpx_id);

diff --git a/drivers/media/i2c/vpx3220.c b/drivers/media/i2c/vpx3220.c
index 5f1a22284168d4256e5fcd236f7a446505ca74ea..29bcbb5a5fbbe510ff8a2abe5d024d598163043a 100644 (file)
--- a/drivers/media/i2c/vpx3220.c
+++ b/drivers/media/i2c/vpx3220.c
@@ -535,9 +535,9 @@ static void vpx3220_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id vpx3220_id[] = {
-       { "vpx3220a" },
-       { "vpx3216b" },
-       { "vpx3214c" },
+       { .name = "vpx3220a" },
+       { .name = "vpx3216b" },
+       { .name = "vpx3214c" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, vpx3220_id);

diff --git a/drivers/media/i2c/wm8739.c b/drivers/media/i2c/wm8739.c
index 72eb10339d0624502c76a3078da8e8ab404baf82..db62bafb447c4ce4a473cebfa49bd738bbd3b2c8 100644 (file)
--- a/drivers/media/i2c/wm8739.c
+++ b/drivers/media/i2c/wm8739.c
@@ -243,7 +243,7 @@ static void wm8739_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id wm8739_id[] = {
-       { "wm8739" },
+       { .name = "wm8739" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, wm8739_id);

diff --git a/drivers/media/i2c/wm8775.c b/drivers/media/i2c/wm8775.c
index 56778d3bc28a7a25880d780ad87f77c4b1f8090b..5db197bb6fdaa04f5ac4f1057ee0e871c78f9e88 100644 (file)
--- a/drivers/media/i2c/wm8775.c
+++ b/drivers/media/i2c/wm8775.c
@@ -289,7 +289,7 @@ static void wm8775_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id wm8775_id[] = {
-       { "wm8775" },
+       { .name = "wm8775" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, wm8775_id);

diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c
index 156cca2866aa5fdb9db964067a4e9177b2684144..d9547f625e30d72b9322025948e2e8cbd489e3fe 100644 (file)
--- a/drivers/media/radio/radio-tea5764.c
+++ b/drivers/media/radio/radio-tea5764.c
@@ -502,7 +502,7 @@ static void tea5764_i2c_remove(struct i2c_client *client)
 
 /* I2C subsystem interface */
 static const struct i2c_device_id tea5764_id[] = {
-       { "radio-tea5764" },
+       { .name = "radio-tea5764" },
        { }                                     /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(i2c, tea5764_id);

diff --git a/drivers/media/radio/saa7706h.c b/drivers/media/radio/saa7706h.c
index 9572a866defbae18591b1e30d8633da4f9a591cd..bd8bd295a9ec292a5f15f042cffb1b7feed1cda7 100644 (file)
--- a/drivers/media/radio/saa7706h.c
+++ b/drivers/media/radio/saa7706h.c
@@ -395,8 +395,8 @@ static void saa7706h_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id saa7706h_id[] = {
-       { DRIVER_NAME },
-       {}
+       { .name = DRIVER_NAME },
+       { }
 };
 
 MODULE_DEVICE_TABLE(i2c, saa7706h_id);

diff --git a/drivers/media/radio/si470x/radio-si470x-i2c.c b/drivers/media/radio/si470x/radio-si470x-i2c.c
index 3932a449a1b1f8982ed4d43c7c2f19a3d36cd802..a1e570af9c59b2f438016b4b012e4b6096c4ea38 100644 (file)
--- a/drivers/media/radio/si470x/radio-si470x-i2c.c
+++ b/drivers/media/radio/si470x/radio-si470x-i2c.c
@@ -28,7 +28,7 @@
 /* I2C Device ID List */
 static const struct i2c_device_id si470x_i2c_id[] = {
        /* Generic Entry */
-       { "si470x" },
+       { .name = "si470x" },
        /* Terminating entry */
        { }
 };

diff --git a/drivers/media/radio/si4713/si4713.c b/drivers/media/radio/si4713/si4713.c
index e71272c6de37a521bd0ab9b962963ead43463eb4..0c0354566b0a782ebf1f200774feba86772db040 100644 (file)
--- a/drivers/media/radio/si4713/si4713.c
+++ b/drivers/media/radio/si4713/si4713.c
@@ -1639,7 +1639,7 @@ static void si4713_remove(struct i2c_client *client)
 
 /* si4713_i2c_driver - i2c driver interface */
 static const struct i2c_device_id si4713_id[] = {
-       { "si4713" },
+       { .name = "si4713" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, si4713_id);

diff --git a/drivers/media/radio/tef6862.c b/drivers/media/radio/tef6862.c
index 3a6d7926e8565a4249c67f378d2a4f0fb6aeceea..2596d7f4f3f1aefb6fa3861493f3f3e4562286b3 100644 (file)
--- a/drivers/media/radio/tef6862.c
+++ b/drivers/media/radio/tef6862.c
@@ -173,8 +173,8 @@ static void tef6862_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id tef6862_id[] = {
-       { DRIVER_NAME },
-       {}
+       { .name = DRIVER_NAME },
+       { }
 };
 
 MODULE_DEVICE_TABLE(i2c, tef6862_id);

diff --git a/drivers/media/test-drivers/vidtv/vidtv_demod.c b/drivers/media/test-drivers/vidtv/vidtv_demod.c
index c382e9e94c328758978c0738d93c3dd42a89574e..6e5fe402976bb70c3969e3023083c0199c53aa9c 100644 (file)
--- a/drivers/media/test-drivers/vidtv/vidtv_demod.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_demod.c
@@ -407,8 +407,8 @@ static const struct dvb_frontend_ops vidtv_demod_ops = {
 };
 
 static const struct i2c_device_id vidtv_demod_i2c_id_table[] = {
-       { "dvb_vidtv_demod" },
-       {}
+       { .name = "dvb_vidtv_demod" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, vidtv_demod_i2c_id_table);
 

diff --git a/drivers/media/test-drivers/vidtv/vidtv_tuner.c b/drivers/media/test-drivers/vidtv/vidtv_tuner.c
index ee55df4029bc91a363944c021f8ccec9cc984573..bd50b86e927c1f612cce347b609857ac21750751 100644 (file)
--- a/drivers/media/test-drivers/vidtv/vidtv_tuner.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_tuner.c
@@ -385,8 +385,8 @@ static const struct dvb_tuner_ops vidtv_tuner_ops = {
 };
 
 static const struct i2c_device_id vidtv_tuner_i2c_id_table[] = {
-       { "dvb_vidtv_tuner" },
-       {}
+       { .name = "dvb_vidtv_tuner" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, vidtv_tuner_i2c_id_table);
 

diff --git a/drivers/media/tuners/e4000.c b/drivers/media/tuners/e4000.c
index b83f37a77224d6cfc9cf944b2d6cb8c22b8a61e3..94abb371540187771a78f7eec0a59d30ad0aad78 100644 (file)
--- a/drivers/media/tuners/e4000.c
+++ b/drivers/media/tuners/e4000.c
@@ -719,8 +719,8 @@ static void e4000_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id e4000_id_table[] = {
-       { "e4000" },
-       {}
+       { .name = "e4000" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, e4000_id_table);
 

diff --git a/drivers/media/tuners/fc2580.c b/drivers/media/tuners/fc2580.c
index 75087d9b224f08c080fb58b671e622e52bd6689b..b76fa1320f5fb3cb6769d8e2285d0b2c2072a7aa 100644 (file)
--- a/drivers/media/tuners/fc2580.c
+++ b/drivers/media/tuners/fc2580.c
@@ -600,8 +600,8 @@ static void fc2580_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id fc2580_id_table[] = {
-       { "fc2580" },
-       {}
+       { .name = "fc2580" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, fc2580_id_table);
 

diff --git a/drivers/media/tuners/m88rs6000t.c b/drivers/media/tuners/m88rs6000t.c
index 0a724cdf0f6d83b1d7ca7cc81d19ec31ca31b37c..1addb3d229cfebc820d3e95abae1cc2b7b0c23c8 100644 (file)
--- a/drivers/media/tuners/m88rs6000t.c
+++ b/drivers/media/tuners/m88rs6000t.c
@@ -709,8 +709,8 @@ static void m88rs6000t_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id m88rs6000t_id[] = {
-       { "m88rs6000t" },
-       {}
+       { .name = "m88rs6000t" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, m88rs6000t_id);
 

diff --git a/drivers/media/tuners/mt2060.c b/drivers/media/tuners/mt2060.c
index ef3196e6bd3033b8ac2e19cc80bf8dbf50eabf97..c57233c7441acd1101169b36de8e317c22bb60f1 100644 (file)
--- a/drivers/media/tuners/mt2060.c
+++ b/drivers/media/tuners/mt2060.c
@@ -514,8 +514,8 @@ static void mt2060_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id mt2060_id_table[] = {
-       { "mt2060" },
-       {}
+       { .name = "mt2060" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, mt2060_id_table);
 

diff --git a/drivers/media/tuners/mxl301rf.c b/drivers/media/tuners/mxl301rf.c
index cfc78891ce03d7b77f7ba287c2744e857f96aa3f..1d84456cb19ba2c3bbc1ac6bb663a1151226f491 100644 (file)
--- a/drivers/media/tuners/mxl301rf.c
+++ b/drivers/media/tuners/mxl301rf.c
@@ -317,8 +317,8 @@ static void mxl301rf_remove(struct i2c_client *client)
 
 
 static const struct i2c_device_id mxl301rf_id[] = {
-       { "mxl301rf" },
-       {}
+       { .name = "mxl301rf" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, mxl301rf_id);
 

diff --git a/drivers/media/tuners/qm1d1b0004.c b/drivers/media/tuners/qm1d1b0004.c
index 07ad84f42c9f1f4fcd9e7fa7113ddb8e344cf168..59d98681e67485e57fe0e51c06154d963507d633 100644 (file)
--- a/drivers/media/tuners/qm1d1b0004.c
+++ b/drivers/media/tuners/qm1d1b0004.c
@@ -243,8 +243,8 @@ static void qm1d1b0004_remove(struct i2c_client *client)
 
 
 static const struct i2c_device_id qm1d1b0004_id[] = {
-       { "qm1d1b0004" },
-       {}
+       { .name = "qm1d1b0004" },
+       { }
 };
 
 MODULE_DEVICE_TABLE(i2c, qm1d1b0004_id);

diff --git a/drivers/media/tuners/qm1d1c0042.c b/drivers/media/tuners/qm1d1c0042.c
index db60562ad69893c9ec8c097ac19241a7b2f440f0..2d19cfdb67b999c227b228149faf4a01f75797bf 100644 (file)
--- a/drivers/media/tuners/qm1d1c0042.c
+++ b/drivers/media/tuners/qm1d1c0042.c
@@ -434,8 +434,8 @@ static void qm1d1c0042_remove(struct i2c_client *client)
 
 
 static const struct i2c_device_id qm1d1c0042_id[] = {
-       { "qm1d1c0042" },
-       {}
+       { .name = "qm1d1c0042" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, qm1d1c0042_id);
 

diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
index 4d67e347c22f01ba0eb3ebab721e61f9905617d1..d517a91e6fbc7edefc2b26f14ef608cb6e010dd8 100644 (file)
--- a/drivers/media/tuners/si2157.c
+++ b/drivers/media/tuners/si2157.c
@@ -1097,11 +1097,11 @@ static void si2157_remove(struct i2c_client *client)
  * all SiLabs TER tuners, as the driver should auto-detect it.
  */
 static const struct i2c_device_id si2157_id_table[] = {
-       {"si2157", SI2157},
-       {"si2146", SI2146},
-       {"si2141", SI2141},
-       {"si2177", SI2177},
-       {}
+       { .name = "si2157", .driver_data = SI2157 },
+       { .name = "si2146", .driver_data = SI2146 },
+       { .name = "si2141", .driver_data = SI2141 },
+       { .name = "si2177", .driver_data = SI2177 },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, si2157_id_table);
 

diff --git a/drivers/media/tuners/tda18212.c b/drivers/media/tuners/tda18212.c
index 5f583c010408f14b6d33ce63625dd45c514f7cbf..18d1850691fb920eb0b6f39b7be0767c36163def 100644 (file)
--- a/drivers/media/tuners/tda18212.c
+++ b/drivers/media/tuners/tda18212.c
@@ -254,8 +254,8 @@ static void tda18212_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id tda18212_id[] = {
-       { "tda18212" },
-       {}
+       { .name = "tda18212" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, tda18212_id);
 

diff --git a/drivers/media/tuners/tda18250.c b/drivers/media/tuners/tda18250.c
index caaf5e0d0c9bc1c60d2292d4293bdc9b8d22a866..7bb945ba098983fccec6c0be1cd09d1d3c67e48b 100644 (file)
--- a/drivers/media/tuners/tda18250.c
+++ b/drivers/media/tuners/tda18250.c
@@ -868,8 +868,8 @@ static void tda18250_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id tda18250_id_table[] = {
-       { "tda18250" },
-       {}
+       { .name = "tda18250" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, tda18250_id_table);
 

diff --git a/drivers/media/tuners/tua9001.c b/drivers/media/tuners/tua9001.c
index c0aed1b441e2794b2ccc1b6bee5c5e7e70f3181f..fcdbf1a0c1d8a56db9dcaecd1695335455d50897 100644 (file)
--- a/drivers/media/tuners/tua9001.c
+++ b/drivers/media/tuners/tua9001.c
@@ -245,8 +245,8 @@ static void tua9001_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id tua9001_id_table[] = {
-       { "tua9001" },
-       {}
+       { .name = "tua9001" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, tua9001_id_table);
 

diff --git a/drivers/media/usb/go7007/s2250-board.c b/drivers/media/usb/go7007/s2250-board.c
index 567f851d58968b4803534eab16d1a880b7649ef2..0901d79e827d9be3834600fc4acafa9451ccc24d 100644 (file)
--- a/drivers/media/usb/go7007/s2250-board.c
+++ b/drivers/media/usb/go7007/s2250-board.c
@@ -611,7 +611,7 @@ static void s2250_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id s2250_id[] = {
-       { "s2250" },
+       { .name = "s2250" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, s2250_id);

diff --git a/drivers/media/v4l2-core/tuner-core.c b/drivers/media/v4l2-core/tuner-core.c
index 004ec4d7beeae4bf5b4ac9752ba4fe80e5f83c61..1e130e6f903f91045f99bab1652ead45ea4c25dc 100644 (file)
--- a/drivers/media/v4l2-core/tuner-core.c
+++ b/drivers/media/v4l2-core/tuner-core.c
@@ -1401,7 +1401,7 @@ static const struct dev_pm_ops tuner_pm_ops = {
 };
 
 static const struct i2c_device_id tuner_id[] = {
-       { "tuner", }, /* autodetect */
+       { .name = "tuner" }, /* autodetect */
        { }
 };
 MODULE_DEVICE_TABLE(i2c, tuner_id);