[PATCH] i2c: Drop i2c_driver.flags, 2 of 3

Just about every i2c chip driver sets the I2C_DF_NOTIFY flag, so we
can simply make it the default and drop the flag. If any driver really
doesn't want to be notified when i2c adapters are added, that driver
can simply omit to set .attach_adapter. This approach is also more
robust as it prevents accidental NULL pointer dereferences.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

37 files changed, 0 insertions, 37 deletions

diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 1ca2b67aedfb..c4f2265167a2 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -502,7 +502,6 @@ static struct i2c_driver i2c_driver_adv7170 = {
         .name = "adv7170",      /* name */
 
         .id = I2C_DRIVERID_ADV7170,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = adv7170_attach_adapter,
         .detach_client = adv7170_detach_client,
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index 173bca1e0295..4fc08b17d4d0 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -552,7 +552,6 @@ static struct i2c_driver i2c_driver_adv7175 = {
         .name = "adv7175",      /* name */
 
         .id = I2C_DRIVERID_ADV7175,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = adv7175_attach_adapter,
         .detach_client = adv7175_detach_client,
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 3ee0afca76a7..7bba69793b78 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -627,7 +627,6 @@ static struct i2c_driver i2c_driver_bt819 = {
         .name = "bt819",
 
         .id = I2C_DRIVERID_BT819,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = bt819_attach_adapter,
         .detach_client = bt819_detach_client,
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index 3ca1d768bfd3..0ba8652357e2 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -233,7 +233,6 @@ static struct i2c_driver driver = {
         .owner          = THIS_MODULE,
         .name           = "i2c bt832 driver",
         .id             = -1, /* FIXME */
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = bt832_probe,
         .detach_client  = bt832_detach,
         .command        = bt832_command,
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 8eb871d0e85b..4c9acd1e2c70 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -409,7 +409,6 @@ static struct i2c_driver i2c_driver_bt856 = {
         .name = "bt856",
 
         .id = I2C_DRIVERID_BT856,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = bt856_attach_adapter,
         .detach_client = bt856_detach_client,
diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
index 780b352ec119..fce5d89b7b15 100644
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
@@ -218,7 +218,6 @@ static int cs53l32a_detach(struct i2c_client *client)
 static struct i2c_driver i2c_driver = {
         .name = "cs53l32a",
         .id = I2C_DRIVERID_CS53L32A,
-        .flags = I2C_DF_NOTIFY,
         .attach_adapter = cs53l32a_probe,
         .detach_client = cs53l32a_detach,
         .command = cs53l32a_command,
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 5b93723a1768..c66bc147ee71 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -847,7 +847,6 @@ static struct i2c_driver i2c_driver_cx25840 = {
         .name = "cx25840",
 
         .id = I2C_DRIVERID_CX25840,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = cx25840_attach_adapter,
         .detach_client = cx25840_detach_client,
diff --git a/drivers/media/video/indycam.c b/drivers/media/video/indycam.c
index deeef125eb92..3eba514cdb29 100644
--- a/drivers/media/video/indycam.c
+++ b/drivers/media/video/indycam.c
@@ -454,7 +454,6 @@ static struct i2c_driver i2c_driver_indycam = {
         .owner          = THIS_MODULE,
         .name           = "indycam",
         .id             = I2C_DRIVERID_INDYCAM,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = indycam_probe,
         .detach_client  = indycam_detach,
         .command        = indycam_command,
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 740e543311af..2e2f78a4afc8 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -280,7 +280,6 @@ static int ir_probe(struct i2c_adapter *adap);
 static struct i2c_driver driver = {
         .name           = "ir remote kbd driver",
         .id             = I2C_DRIVERID_INFRARED,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = ir_probe,
         .detach_client  = ir_detach,
 };
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index d86f8e92e534..46328fb6fe80 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -1564,7 +1564,6 @@ static struct i2c_driver driver = {
         .owner          = THIS_MODULE,
         .name           = "msp3400",
         .id             = I2C_DRIVERID_MSP3400,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = msp_probe,
         .detach_client  = msp_detach,
         .command        = msp_command,
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 2de34ebf0673..390d0d6c7838 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -414,7 +414,6 @@ static struct i2c_driver driver = {
         .name =                 "ovcamchip",
         .id =                   I2C_DRIVERID_OVCAMCHIP,
         .class =                I2C_CLASS_CAM_DIGITAL,
-        .flags =                I2C_DF_NOTIFY,
         .attach_adapter =       ovcamchip_attach,
         .detach_client =        ovcamchip_detach,
         .command =              ovcamchip_command,
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index b8054da31ffd..9bf686989aab 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -166,7 +166,6 @@ static struct i2c_driver i2c_driver_videotext =
         .owner          = THIS_MODULE,
         .name           = IF_NAME,              /* name */
         .id             = I2C_DRIVERID_SAA5249, /* in i2c.h */
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = saa5246a_probe,
         .detach_client  = saa5246a_detach,
         .command        = saa5246a_command
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 7ffa2e9a9bf3..811e86396030 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -239,7 +239,6 @@ static struct i2c_driver i2c_driver_videotext =
         .owner          = THIS_MODULE,
         .name           = IF_NAME,              /* name */
         .id             = I2C_DRIVERID_SAA5249, /* in i2c.h */
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = saa5249_probe,
         .detach_client  = saa5249_detach,
         .command        = saa5249_command
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index 923322503e8f..18a0b7143e8b 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -498,7 +498,6 @@ static struct i2c_driver driver = {
         .owner = THIS_MODULE,
         .name = "i2c saa6588 driver",
         .id = -1,               /* FIXME */
-        .flags = I2C_DF_NOTIFY,
         .attach_adapter = saa6588_probe,
         .detach_client = saa6588_detach,
         .command = saa6588_command,
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index e116bdbed310..f266b35ceb35 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -591,7 +591,6 @@ static struct i2c_driver i2c_driver_saa7110 = {
         .name = "saa7110",
 
         .id = I2C_DRIVERID_SAA7110,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = saa7110_attach_adapter,
         .detach_client = saa7110_detach_client,
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index fe8a5e453969..687beaf11adc 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -594,7 +594,6 @@ static struct i2c_driver i2c_driver_saa7111 = {
         .name = "saa7111",
 
         .id = I2C_DRIVERID_SAA7111A,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = saa7111_attach_adapter,
         .detach_client = saa7111_detach_client,
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index d9f50e2f7b92..4748cf0598c0 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -1208,7 +1208,6 @@ static struct i2c_driver i2c_driver_saa7114 = {
         .name = "saa7114",
 
         .id = I2C_DRIVERID_SAA7114,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = saa7114_attach_adapter,
         .detach_client = saa7114_detach_client,
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index e717e30d8187..b1079de938b7 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1356,7 +1356,6 @@ static int saa7115_detach(struct i2c_client *client)
 static struct i2c_driver i2c_driver_saa7115 = {
         .name = "saa7115",
         .id = I2C_DRIVERID_SAA711X,
-        .flags = I2C_DF_NOTIFY,
         .attach_adapter = saa7115_probe,
         .detach_client = saa7115_detach,
         .command = saa7115_command,
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c
index 31f7b950b01c..734a70919080 100644
--- a/drivers/media/video/saa711x.c
+++ b/drivers/media/video/saa711x.c
@@ -569,7 +569,6 @@ static struct i2c_driver i2c_driver_saa711x = {
         .name = "saa711x",
 
         .id = I2C_DRIVERID_SAA711X,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = saa711x_attach_adapter,
         .detach_client = saa711x_detach_client,
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index c36f014f1fdf..a2fab9837507 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -821,7 +821,6 @@ static int saa7127_detach(struct i2c_client *client)
 static struct i2c_driver i2c_driver_saa7127 = {
         .name = "saa7127",
         .id = I2C_DRIVERID_SAA7127,
-        .flags = I2C_DF_NOTIFY,
         .attach_adapter = saa7127_probe,
         .detach_client = saa7127_detach,
         .command = saa7127_command,
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index a61d24f588f7..6fc298e0a03a 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -600,7 +600,6 @@ static struct i2c_driver driver = {
         .owner          = THIS_MODULE,
         .name           = "i2c saa6752hs MPEG encoder",
         .id             = I2C_DRIVERID_SAA6752HS,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = saa6752hs_probe,
         .detach_client  = saa6752hs_detach,
         .command        = saa6752hs_command,
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 132aa7943c16..e24aa16f2d8c 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -491,7 +491,6 @@ static struct i2c_driver i2c_driver_saa7185 = {
         .name = "saa7185",      /* name */
 
         .id = I2C_DRIVERID_SAA7185B,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = saa7185_attach_adapter,
         .detach_client = saa7185_detach_client,
diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c
index cbca896e8cfa..6be98fc0fe24 100644
--- a/drivers/media/video/saa7191.c
+++ b/drivers/media/video/saa7191.c
@@ -791,7 +791,6 @@ static struct i2c_driver i2c_driver_saa7191 = {
         .owner          = THIS_MODULE,
         .name           = "saa7191",
         .id             = I2C_DRIVERID_SAA7191,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = saa7191_probe,
         .detach_client  = saa7191_detach,
         .command        = saa7191_command
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index d32737dd2142..239a58666a12 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -504,7 +504,6 @@ static struct i2c_driver driver = {
         .owner           = THIS_MODULE,
         .name            = "i2c tda7432 driver",
         .id              = I2C_DRIVERID_TDA7432,
-        .flags           = I2C_DF_NOTIFY,
         .attach_adapter  = tda7432_probe,
         .detach_client   = tda7432_detach,
         .command         = tda7432_command,
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index 1794686612c6..f29fb507075d 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -224,7 +224,6 @@ static struct i2c_driver driver = {
         .owner  = THIS_MODULE,
         .name   = "tda9840",
         .id     = I2C_DRIVERID_TDA9840,
-        .flags  = I2C_DF_NOTIFY,
         .attach_adapter = attach,
         .detach_client  = detach,
         .command        = command,
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index a5e37dc91f39..d053b6445502 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -375,7 +375,6 @@ static struct i2c_driver driver = {
         .owner          = THIS_MODULE,
         .name           = "i2c tda9875 driver",
         .id             = I2C_DRIVERID_TDA9875,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = tda9875_probe,
         .detach_client  = tda9875_detach,
         .command        = tda9875_command,
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 2f2414e90e8b..049b44e0767b 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -822,7 +822,6 @@ static struct i2c_driver driver = {
         .owner          = THIS_MODULE,
         .name           = "i2c tda9887 driver",
         .id             = -1, /* FIXME */
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = tda9887_probe,
         .detach_client  = tda9887_detach,
         .command        = tda9887_command,
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index ee3688348b66..96d88ce60c98 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -193,7 +193,6 @@ static struct i2c_driver driver = {
         .owner  = THIS_MODULE,
         .name   = "tea6415c",
         .id     = I2C_DRIVERID_TEA6415C,
-        .flags  = I2C_DF_NOTIFY,
         .attach_adapter = attach,
         .detach_client  = detach,
         .command        = command,
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index 17975c19da5e..fd417de95847 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -170,7 +170,6 @@ static struct i2c_driver driver = {
         .owner  = THIS_MODULE,
         .name   = "tea6420",
         .id     = I2C_DRIVERID_TEA6420,
-        .flags  = I2C_DF_NOTIFY,
         .attach_adapter = attach,
         .detach_client  = detach,
         .command        = command,
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index 79203595b9c1..3505cec2e65a 100644
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -178,7 +178,6 @@ i2c_driver_tuner =
         .owner          =       THIS_MODULE,
         .name           =       "sab3036",
         .id             =       I2C_DRIVERID_SAB3036,
-        .flags          =       I2C_DF_NOTIFY,
         .attach_adapter =       tuner_probe,
         .detach_client  =       tuner_detach,
         .command        =       tuner_command
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index e58abdfcaab8..3c75121f6383 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -745,7 +745,6 @@ static struct i2c_driver driver = {
         .owner = THIS_MODULE,
         .name = "tuner",
         .id = I2C_DRIVERID_TUNER,
-        .flags = I2C_DF_NOTIFY,
         .attach_adapter = tuner_probe,
         .detach_client = tuner_detach,
         .command = tuner_command,
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 5b20e8177cad..3565f35be7a1 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1705,7 +1705,6 @@ static struct i2c_driver driver = {
         .owner           = THIS_MODULE,
         .name            = "generic i2c audio driver",
         .id              = I2C_DRIVERID_TVAUDIO,
-        .flags           = I2C_DF_NOTIFY,
         .attach_adapter  = chip_probe,
         .detach_client   = chip_detach,
         .command         = chip_command,
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 5ac235365dd8..195bc51d4576 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -782,7 +782,6 @@ static struct i2c_driver i2c_driver_tveeprom = {
         .owner          = THIS_MODULE,
         .name           = "tveeprom",
         .id             = I2C_DRIVERID_TVEEPROM,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = tveeprom_attach_adapter,
         .detach_client  = tveeprom_detach_client,
         .command        = tveeprom_command,
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 5897e5d4d3d2..936e01d2c785 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -232,7 +232,6 @@ static struct i2c_driver driver = {
 #endif
         .name            = "tv card mixer driver",
         .id              = I2C_DRIVERID_TVMIXER,
-        .flags           = I2C_DF_NOTIFY,
         .detach_adapter  = tvmixer_adapters,
         .attach_adapter  = tvmixer_adapters,
         .detach_client   = tvmixer_clients,
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 97431e26d229..4f3ee2091611 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -806,7 +806,6 @@ static struct i2c_driver driver = {
 
         /* FIXME */
         .id = I2C_DRIVERID_SAA7110,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = tvp5150_attach_adapter,
         .detach_client = tvp5150_detach_client,
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 137b58f2c666..c66d28505bcd 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -726,7 +726,6 @@ static struct i2c_driver vpx3220_i2c_driver = {
         .name = "vpx3220",
 
         .id = I2C_DRIVERID_VPX3220,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = vpx3220_attach_adapter,
         .detach_client = vpx3220_detach_client,
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index a6936ad74fcf..7b07717a3c67 100644
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
@@ -236,7 +236,6 @@ static struct i2c_driver i2c_driver = {
         .name = "wm8775",
 
         .id = I2C_DRIVERID_WM8775,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = wm8775_probe,
         .detach_client = wm8775_detach,