[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>

diff --git a/Documentation/i2c/porting-clients b/Documentation/i2c/porting-clients
index 184fac2377aa19e6e2cafafa34f704debd51941a..64c610bf2fbc14325d82ef5c3f91f430752dfcad 100644 (file)
--- a/Documentation/i2c/porting-clients
+++ b/Documentation/i2c/porting-clients
@@ -109,6 +109,9 @@ Technical changes:
   there is a MODULE_LICENSE() line, at the bottom of the file
   (after MODULE_AUTHOR() and MODULE_DESCRIPTION(), in this order).
 
+* [Driver] The flags field of the i2c_driver structure is gone.
+  I2C_DF_NOTIFY is now the default behavior.
+
 Coding policy:
 
 * [Copyright] Use (C), not (c), for copyright.

diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients
index d19993cc06041878f3c3d78979b55213c4ee75a9..59d2c169cd61dfe9d0f834983a7e2b8b1210896d 100644 (file)
--- a/Documentation/i2c/writing-clients
+++ b/Documentation/i2c/writing-clients
@@ -27,7 +27,6 @@ address.
 static struct i2c_driver foo_driver = {
        .owner          = THIS_MODULE,
        .name           = "Foo version 2.3 driver",
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = &foo_attach_adapter,
        .detach_client  = &foo_detach_client,
        .command        = &foo_command /* may be NULL */
@@ -36,10 +35,6 @@ static struct i2c_driver foo_driver = {
 The name field must match the driver name, including the case. It must not
 contain spaces, and may be up to 31 characters long.
 
-Don't worry about the flags field; just put I2C_DF_NOTIFY into it. This
-means that your driver will be notified when new adapters are found.
-This is almost always what you want.
-
 All other fields are for call-back functions which will be explained 
 below.
 

diff --git a/arch/arm/mach-pxa/akita-ioexp.c b/arch/arm/mach-pxa/akita-ioexp.c
index f6d73cc01f783b1f6c572be87300a97238d0a0b8..440ebb3c3db1129e093b92011289cc5177138c20 100644 (file)
--- a/arch/arm/mach-pxa/akita-ioexp.c
+++ b/arch/arm/mach-pxa/akita-ioexp.c
@@ -127,7 +127,6 @@ static struct i2c_driver max7310_i2c_driver = {
        .owner          = THIS_MODULE,
        .name           = "akita-max7310",
        .id             = I2C_DRIVERID_AKITAIOEXP,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = max7310_attach_adapter,
        .detach_client  = max7310_detach_client,
 };

diff --git a/drivers/acorn/char/pcf8583.c b/drivers/acorn/char/pcf8583.c
index e26f007a1417b8312706c2fbfd164ecf4f945491..befc9469b4f2e3de5c3546004a0e641fc11f6dbc 100644 (file)
--- a/drivers/acorn/char/pcf8583.c
+++ b/drivers/acorn/char/pcf8583.c
@@ -259,7 +259,6 @@ pcf8583_command(struct i2c_client *client, unsigned int cmd, void *arg)
 static struct i2c_driver pcf8583_driver = {
        .name           = "PCF8583",
        .id             = I2C_DRIVERID_PCF8583,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = pcf8583_probe,
        .detach_client  = pcf8583_detach,
        .command        = pcf8583_command

diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index 8102876c7c3f2cf69e9145ca3b1f3241ff487678..5e6df4b7b8570e83bdfa06bfa37795fbed7a1bbf 100644 (file)
--- a/drivers/hwmon/adm1021.c
+++ b/drivers/hwmon/adm1021.c
@@ -129,7 +129,6 @@ static struct i2c_driver adm1021_driver = {
        .owner          = THIS_MODULE,
        .name           = "adm1021",
        .id             = I2C_DRIVERID_ADM1021,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = adm1021_attach_adapter,
        .detach_client  = adm1021_detach_client,
 };

diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c
index bf67860e6a206e7fbdd32f689fed3ef791baac23..2be48a7a90b85aabc73b4a74260c5e83f0aed8a7 100644 (file)
--- a/drivers/hwmon/adm1025.c
+++ b/drivers/hwmon/adm1025.c
@@ -121,7 +121,6 @@ static struct i2c_driver adm1025_driver = {
        .owner          = THIS_MODULE,
        .name           = "adm1025",
        .id             = I2C_DRIVERID_ADM1025,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = adm1025_attach_adapter,
        .detach_client  = adm1025_detach_client,
 };

diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index 5036b17a39cd3098690dddbcb3dbddb96dc0900b..5416db809f9707e9d51e20520eb28244f760744c 100644 (file)
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -310,7 +310,6 @@ static void adm1026_init_client(struct i2c_client *client);
 static struct i2c_driver adm1026_driver = {
        .owner          = THIS_MODULE,
        .name           = "adm1026",
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = adm1026_attach_adapter,
        .detach_client  = adm1026_detach_client,
 };

diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
index 7c545d5eee4570f0cbe9c4e175db925db36344bd..1e24428090c4bb49f7d4800ab940988f57be1010 100644 (file)
--- a/drivers/hwmon/adm1031.c
+++ b/drivers/hwmon/adm1031.c
@@ -107,7 +107,6 @@ static struct adm1031_data *adm1031_update_device(struct device *dev);
 static struct i2c_driver adm1031_driver = {
        .owner = THIS_MODULE,
        .name = "adm1031",
-       .flags = I2C_DF_NOTIFY,
        .attach_adapter = adm1031_attach_adapter,
        .detach_client = adm1031_detach_client,
 };

diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c
index 11dc95f8a17ea5185637bdb5dc2f9fe85e841ac3..287733fe2c0da6abdd4e1a63f950100a3d266e15 100644 (file)
--- a/drivers/hwmon/adm9240.c
+++ b/drivers/hwmon/adm9240.c
@@ -140,7 +140,6 @@ static struct i2c_driver adm9240_driver = {
        .owner          = THIS_MODULE,
        .name           = "adm9240",
        .id             = I2C_DRIVERID_ADM9240,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = adm9240_attach_adapter,
        .detach_client  = adm9240_detach_client,
 };

diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index 52c469722a6584ea622618dbd99c6c53ff43b329..7227f800bef9580d16f02d6add8eb13a792691e0 100644 (file)
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -220,7 +220,6 @@ static struct i2c_driver asb100_driver = {
        .owner          = THIS_MODULE,
        .name           = "asb100",
        .id             = I2C_DRIVERID_ASB100,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = asb100_attach_adapter,
        .detach_client  = asb100_detach_client,
 };

diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c
index 53324f56404e2c38979e8b7401e6b4b254028783..a60a9f20281b6557c9c5cb7d7937168cd68073ff 100644 (file)
--- a/drivers/hwmon/atxp1.c
+++ b/drivers/hwmon/atxp1.c
@@ -52,7 +52,6 @@ static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind);
 static struct i2c_driver atxp1_driver = {
        .owner          = THIS_MODULE,
        .name           = "atxp1",
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = atxp1_attach_adapter,
        .detach_client  = atxp1_detach_client,
 };

diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index 34f71b7c7f3786056fd1cabca7787f95307c674f..0096eb37c663e05b25b01ff31da79c18e525f292 100644 (file)
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -92,7 +92,6 @@ static struct i2c_driver ds1621_driver = {
        .owner          = THIS_MODULE,
        .name           = "ds1621",
        .id             = I2C_DRIVERID_DS1621,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = ds1621_attach_adapter,
        .detach_client  = ds1621_detach_client,
 };

diff --git a/drivers/hwmon/fscher.c b/drivers/hwmon/fscher.c
index a02e1c34c757db66aaf5048d3544146c057fe8d6..f56ca06dbf8811cd5aa891a4ce7fbaf0f1b7c2cd 100644 (file)
--- a/drivers/hwmon/fscher.c
+++ b/drivers/hwmon/fscher.c
@@ -121,7 +121,6 @@ static struct i2c_driver fscher_driver = {
        .owner          = THIS_MODULE,
        .name           = "fscher",
        .id             = I2C_DRIVERID_FSCHER,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = fscher_attach_adapter,
        .detach_client  = fscher_detach_client,
 };

diff --git a/drivers/hwmon/fscpos.c b/drivers/hwmon/fscpos.c
index 64e4edc64f8d40bcd93f8d0c4c4978b7dd9f6b2c..701dffc2ceed20c611ad39cbbb8216bdfefbb3a9 100644 (file)
--- a/drivers/hwmon/fscpos.c
+++ b/drivers/hwmon/fscpos.c
@@ -103,7 +103,6 @@ static struct i2c_driver fscpos_driver = {
        .owner          = THIS_MODULE,
        .name           = "fscpos",
        .id             = I2C_DRIVERID_FSCPOS,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = fscpos_attach_adapter,
        .detach_client  = fscpos_detach_client,
 };

diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c
index 2f178dbe3d87f5d624d467782c9237625ddada15..5788bbb77d8d5934b3a3c958a4d564aaba6ddefa 100644 (file)
--- a/drivers/hwmon/gl518sm.c
+++ b/drivers/hwmon/gl518sm.c
@@ -154,7 +154,6 @@ static struct i2c_driver gl518_driver = {
        .owner          = THIS_MODULE,
        .name           = "gl518sm",
        .id             = I2C_DRIVERID_GL518,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = gl518_attach_adapter,
        .detach_client  = gl518_detach_client,
 };

diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index c39ba12394260faebe9c1088e86e5e42a1b7b3ca..b3998165193d62289fc8baf33690704bb517aaef 100644 (file)
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -112,7 +112,6 @@ static struct i2c_driver gl520_driver = {
        .owner          = THIS_MODULE,
        .name           = "gl520sm",
        .id             = I2C_DRIVERID_GL520,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = gl520_attach_adapter,
        .detach_client  = gl520_detach_client,
 };

diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index a61f5d00f10a2abf1cf0211c9f7d1355db0cf28e..d5f0d92378c5899aaf827a5139f91d2fdd2dffdb 100644 (file)
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -237,7 +237,6 @@ static struct i2c_driver it87_driver = {
        .owner          = THIS_MODULE,
        .name           = "it87",
        .id             = I2C_DRIVERID_IT87,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = it87_attach_adapter,
        .detach_client  = it87_detach_client,
 };

diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index 954ec249724974107a14964ec00c2e3e25eb261f..c2dd4ac8042d9aca55269f7d088c9669d0a9ea1c 100644 (file)
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -141,7 +141,6 @@ static void lm63_init_client(struct i2c_client *client);
 static struct i2c_driver lm63_driver = {
        .owner          = THIS_MODULE,
        .name           = "lm63",
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = lm63_attach_adapter,
        .detach_client  = lm63_detach_client,
 };

diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index d70f4c8fc1e6834f11443ef98a9a8750e1d21c25..0bcbd65151394594da346aca362caa58e0462777 100644 (file)
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -69,7 +69,6 @@ static struct i2c_driver lm75_driver = {
        .owner          = THIS_MODULE,
        .name           = "lm75",
        .id             = I2C_DRIVERID_LM75,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = lm75_attach_adapter,
        .detach_client  = lm75_detach_client,
 };

diff --git a/drivers/hwmon/lm77.c b/drivers/hwmon/lm77.c
index 9380fda7dcd129015af886f1360b650f216aad78..6a524e92432e214e5ee40ebfc15d7f6ce9d2bfe2 100644 (file)
--- a/drivers/hwmon/lm77.c
+++ b/drivers/hwmon/lm77.c
@@ -76,7 +76,6 @@ static struct lm77_data *lm77_update_device(struct device *dev);
 static struct i2c_driver lm77_driver = {
        .owner          = THIS_MODULE,
        .name           = "lm77",
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = lm77_attach_adapter,
        .detach_client  = lm77_detach_client,
 };

diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 78cdd506439feae1a31424afd3da7f9ad7fcaaa7..18448f83a6b0099671727159b7a2d953b0bb3543 100644 (file)
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -167,7 +167,6 @@ static struct i2c_driver lm78_driver = {
        .owner          = THIS_MODULE,
        .name           = "lm78",
        .id             = I2C_DRIVERID_LM78,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = lm78_attach_adapter,
        .detach_client  = lm78_detach_client,
 };

diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
index c359fdea211eddaba1e520fe919427f8a3d3bf3a..02303fa0c4647ddd1e37779b9696cc2ef3ae58ec 100644 (file)
--- a/drivers/hwmon/lm80.c
+++ b/drivers/hwmon/lm80.c
@@ -146,7 +146,6 @@ static struct i2c_driver lm80_driver = {
        .owner          = THIS_MODULE,
        .name           = "lm80",
        .id             = I2C_DRIVERID_LM80,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = lm80_attach_adapter,
        .detach_client  = lm80_detach_client,
 };

diff --git a/drivers/hwmon/lm83.c b/drivers/hwmon/lm83.c
index 9a70611a9f69ed5028af1d2b60ab0f11f5726312..96cb34ea2490a17bbaee9b5a3d3012877d8e1502 100644 (file)
--- a/drivers/hwmon/lm83.c
+++ b/drivers/hwmon/lm83.c
@@ -127,7 +127,6 @@ static struct i2c_driver lm83_driver = {
        .owner          = THIS_MODULE,
        .name           = "lm83",
        .id             = I2C_DRIVERID_LM83,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = lm83_attach_adapter,
        .detach_client  = lm83_detach_client,
 };

diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index 3f5544a40f3c456015713710d217ba7ba882864d..131ecab094acdc519bc299341dfb77181862fb11 100644 (file)
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -383,7 +383,6 @@ static struct i2c_driver lm85_driver = {
        .owner          = THIS_MODULE,
        .name           = "lm85",
        .id             = I2C_DRIVERID_LM85,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = lm85_attach_adapter,
        .detach_client  = lm85_detach_client,
 };

diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index eeec18177861ca67074189f03ce74df0019fa476..26fd0b33beafa21f01093d647f68aa30b2003a1b 100644 (file)
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -164,7 +164,6 @@ static struct i2c_driver lm87_driver = {
        .owner          = THIS_MODULE,
        .name           = "lm87",
        .id             = I2C_DRIVERID_LM87,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = lm87_attach_adapter,
        .detach_client  = lm87_detach_client,
 };

diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 83cf2e1b09f547516b7096d6879e405106794e79..011923b7091d870da8c96f8a5c7e1f0a28a22e86 100644 (file)
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -189,7 +189,6 @@ static struct i2c_driver lm90_driver = {
        .owner          = THIS_MODULE,
        .name           = "lm90",
        .id             = I2C_DRIVERID_LM90,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = lm90_attach_adapter,
        .detach_client  = lm90_detach_client,
 };

diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c
index 7a4b3701ed1a5c0fec354a9739f9a92954059bc4..2005a9ee61fb488ebc8f536a05cdb8db84fa5eb1 100644 (file)
--- a/drivers/hwmon/lm92.c
+++ b/drivers/hwmon/lm92.c
@@ -413,7 +413,6 @@ static struct i2c_driver lm92_driver = {
        .owner          = THIS_MODULE,
        .name           = "lm92",
        .id             = I2C_DRIVERID_LM92,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = lm92_attach_adapter,
        .detach_client  = lm92_detach_client,
 };

diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index 69e7e125683bb4f13b19a0d1b8fe6a4af8b22f83..d5aebef126d53e5035a045584189a7e2357521cc 100644 (file)
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -92,7 +92,6 @@ static struct max1619_data *max1619_update_device(struct device *dev);
 static struct i2c_driver max1619_driver = {
        .owner          = THIS_MODULE,
        .name           = "max1619",
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = max1619_attach_adapter,
        .detach_client  = max1619_detach_client,
 };

diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index ffdb3a03e2b5f9bd39bc8c551f04506df4a92081..a78929f2b3d8b8781eaf7849a9b07a3cc9e2a0f0 100644 (file)
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -272,7 +272,6 @@ static struct i2c_driver w83781d_driver = {
        .owner = THIS_MODULE,
        .name = "w83781d",
        .id = I2C_DRIVERID_W83781D,
-       .flags = I2C_DF_NOTIFY,
        .attach_adapter = w83781d_attach_adapter,
        .detach_client = w83781d_detach_client,
 };

diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
index 1ba072630361959678ef87def072a43755464345..6824243d90d71cd594a4dbec9fd9a1c6e555239e 100644 (file)
--- a/drivers/hwmon/w83792d.c
+++ b/drivers/hwmon/w83792d.c
@@ -319,7 +319,6 @@ static void w83792d_init_client(struct i2c_client *client);
 static struct i2c_driver w83792d_driver = {
        .owner = THIS_MODULE,
        .name = "w83792d",
-       .flags = I2C_DF_NOTIFY,
        .attach_adapter = w83792d_attach_adapter,
        .detach_client = w83792d_detach_client,
 };

diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index f495b63786685ba72f77079bcdd361dde7bd18bf..35172fb455d0abe4db1a9948cbc685ed311a5695 100644 (file)
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -95,7 +95,6 @@ static struct i2c_driver w83l785ts_driver = {
        .owner          = THIS_MODULE,
        .name           = "w83l785ts",
        .id             = I2C_DRIVERID_W83L785TS,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = w83l785ts_attach_adapter,
        .detach_client  = w83l785ts_detach_client,
 };

diff --git a/drivers/i2c/chips/ds1337.c b/drivers/i2c/chips/ds1337.c
index 18228957606cf55918dfe5e769ac24055e0b7fb6..65146cbc83905766f4e09d6a1fd022ccbefb9091 100644 (file)
--- a/drivers/i2c/chips/ds1337.c
+++ b/drivers/i2c/chips/ds1337.c
@@ -54,7 +54,6 @@ static int ds1337_command(struct i2c_client *client, unsigned int cmd,
 static struct i2c_driver ds1337_driver = {
        .owner          = THIS_MODULE,
        .name           = "ds1337",
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = ds1337_attach_adapter,
        .detach_client  = ds1337_detach_client,
        .command        = ds1337_command,

diff --git a/drivers/i2c/chips/ds1374.c b/drivers/i2c/chips/ds1374.c
index da488b735abf621af4f0bed7578843798c39f282..5a270d60b699d69ae8663bd5bb78c3822b22a4a7 100644 (file)
--- a/drivers/i2c/chips/ds1374.c
+++ b/drivers/i2c/chips/ds1374.c
@@ -235,7 +235,6 @@ static struct i2c_driver ds1374_driver = {
        .owner = THIS_MODULE,
        .name = DS1374_DRV_NAME,
        .id = I2C_DRIVERID_DS1374,
-       .flags = I2C_DF_NOTIFY,
        .attach_adapter = ds1374_attach,
        .detach_client = ds1374_detach,
 };

diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
index 4baf573fa04f370c634bd99177466d120ba07d30..9bb1f8b3f38cb670b40a2704deddf08cb2c4bd49 100644 (file)
--- a/drivers/i2c/chips/eeprom.c
+++ b/drivers/i2c/chips/eeprom.c
@@ -71,7 +71,6 @@ static struct i2c_driver eeprom_driver = {
        .owner          = THIS_MODULE,
        .name           = "eeprom",
        .id             = I2C_DRIVERID_EEPROM,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = eeprom_attach_adapter,
        .detach_client  = eeprom_detach_client,
 };

diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index d2a100d778392239a281591d7f1d8c8019aa197d..4f472ba66a02308bb2c6db7c40d99d6ff38d49fd 100644 (file)
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -1636,7 +1636,6 @@ static struct i2c_driver isp1301_driver = {
        .name           = "isp1301_omap",
        .id             = 1301,         /* FIXME "official", i2c-ids.h */
        .class          = I2C_CLASS_HWMON,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = isp1301_scan_bus,
        .detach_client  = isp1301_detach_client,
 };

diff --git a/drivers/i2c/chips/m41t00.c b/drivers/i2c/chips/m41t00.c
index 3df309ae44a6e9f30da0f66698a73825bbc7217f..13e67836b348d832c01d3ee6fa0057855d777987 100644 (file)
--- a/drivers/i2c/chips/m41t00.c
+++ b/drivers/i2c/chips/m41t00.c
@@ -214,7 +214,6 @@ static struct i2c_driver m41t00_driver = {
        .owner          = THIS_MODULE,
        .name           = M41T00_DRV_NAME,
        .id             = I2C_DRIVERID_STM41T00,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = m41t00_attach,
        .detach_client  = m41t00_detach,
 };

diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c
index b376a006883cdc2ccfb0b0198fd988b4a5c63f65..7e61019e72dd6012083e8b4b9211923c0c04faf7 100644 (file)
--- a/drivers/i2c/chips/max6875.c
+++ b/drivers/i2c/chips/max6875.c
@@ -69,7 +69,6 @@ static int max6875_detach_client(struct i2c_client *client);
 static struct i2c_driver max6875_driver = {
        .owner          = THIS_MODULE,
        .name           = "max6875",
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = max6875_attach_adapter,
        .detach_client  = max6875_detach_client,
 };

diff --git a/drivers/i2c/chips/pca9539.c b/drivers/i2c/chips/pca9539.c
index 59a9303462297737adc275f0eb3bcece12901280..26feb7a4f9423b4a50341cddb456bc67854d2e9f 100644 (file)
--- a/drivers/i2c/chips/pca9539.c
+++ b/drivers/i2c/chips/pca9539.c
@@ -40,7 +40,6 @@ static int pca9539_detach_client(struct i2c_client *client);
 static struct i2c_driver pca9539_driver = {
        .owner          = THIS_MODULE,
        .name           = "pca9539",
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = pca9539_attach_adapter,
        .detach_client  = pca9539_detach_client,
 };

diff --git a/drivers/i2c/chips/pcf8574.c b/drivers/i2c/chips/pcf8574.c
index c323c2de236c876921235abb72afb8a38ee38ab3..2fae640cf329dc8e674fa2eac36b7c6105e1e5b2 100644 (file)
--- a/drivers/i2c/chips/pcf8574.c
+++ b/drivers/i2c/chips/pcf8574.c
@@ -68,7 +68,6 @@ static struct i2c_driver pcf8574_driver = {
        .owner          = THIS_MODULE,
        .name           = "pcf8574",
        .id             = I2C_DRIVERID_PCF8574,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = pcf8574_attach_adapter,
        .detach_client  = pcf8574_detach_client,
 };

diff --git a/drivers/i2c/chips/pcf8591.c b/drivers/i2c/chips/pcf8591.c
index ce420a67560bf2cc457148953828dc7dfb6fdb27..8750f71278e1b0d2d616efa5450e991f7078b6aa 100644 (file)
--- a/drivers/i2c/chips/pcf8591.c
+++ b/drivers/i2c/chips/pcf8591.c
@@ -91,7 +91,6 @@ static struct i2c_driver pcf8591_driver = {
        .owner          = THIS_MODULE,
        .name           = "pcf8591",
        .id             = I2C_DRIVERID_PCF8591,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = pcf8591_attach_adapter,
        .detach_client  = pcf8591_detach_client,
 };

diff --git a/drivers/i2c/chips/rtc8564.c b/drivers/i2c/chips/rtc8564.c
index 26e498d921da38eafd1f3e354d334ea35ae4dedb..e586f75dd024ade3ab5bedf2efe70772fc30ee61 100644 (file)
--- a/drivers/i2c/chips/rtc8564.c
+++ b/drivers/i2c/chips/rtc8564.c
@@ -362,7 +362,6 @@ static struct i2c_driver rtc8564_driver = {
        .owner          = THIS_MODULE,
        .name           = "RTC8564",
        .id             = I2C_DRIVERID_RTC8564,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = rtc8564_probe,
        .detach_client  = rtc8564_detach,
        .command        = rtc8564_command

diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index 280dd7a45db65bee454d9db2bb49398b63678f52..439bf6ceb7896c593fd1b63b993ca85098179f2f 100644 (file)
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -639,7 +639,6 @@ static int __init tps65010_scan_bus(struct i2c_adapter *bus)
 static struct i2c_driver tps65010_driver = {
        .owner          = THIS_MODULE,
        .name           = "tps65010",
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = tps65010_scan_bus,
        .detach_client  = __exit_p(tps65010_detach_client),
 };

diff --git a/drivers/i2c/chips/x1205.c b/drivers/i2c/chips/x1205.c
index 7da366cdc18c5467cdf30514c1ec6a843c823b84..c5ff2cee15ae33f72e8614e1d999520a53b9f6f6 100644 (file)
--- a/drivers/i2c/chips/x1205.c
+++ b/drivers/i2c/chips/x1205.c
@@ -107,7 +107,6 @@ static int x1205_command(struct i2c_client *client, unsigned int cmd,
 static struct i2c_driver x1205_driver = {
        .owner          = THIS_MODULE,
        .name           = "x1205",
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = &x1205_attach,
        .detach_client  = &x1205_detach,
 };

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 82ea1b7ec9145536439467778300e29dd1ac0e1d..ad68ac00d910205b372b8607bc6bb8c11cd4bc6a 100644 (file)
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -197,7 +197,7 @@ int i2c_add_adapter(struct i2c_adapter *adap)
        /* inform drivers of new adapters */
        list_for_each(item,&drivers) {
                driver = list_entry(item, struct i2c_driver, list);
-               if (driver->flags & I2C_DF_NOTIFY)
+               if (driver->attach_adapter)
                        /* We ignore the return code; if it fails, too bad */
                        driver->attach_adapter(adap);
        }
@@ -309,7 +309,7 @@ int i2c_add_driver(struct i2c_driver *driver)
        pr_debug("i2c-core: driver [%s] registered\n", driver->name);
 
        /* now look for instances of driver on our adapters */
-       if (driver->flags & I2C_DF_NOTIFY) {
+       if (driver->attach_adapter) {
                list_for_each(item,&adapters) {
                        adapter = list_entry(item, struct i2c_adapter, list);
                        driver->attach_adapter(adapter);

diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 8af0bd1424d21574f6c284bcdd6ea79ed2f92c75..9da51eb37c06f83452337a0fc9f96faa13225658 100644 (file)
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -484,7 +484,6 @@ static struct i2c_driver i2cdev_driver = {
        .owner          = THIS_MODULE,
        .name           = "dev_driver",
        .id             = I2C_DRIVERID_I2CDEV,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = i2cdev_attach_adapter,
        .detach_adapter = i2cdev_detach_adapter,
        .detach_client  = i2cdev_detach_client,

diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index f38696622eb4a201667649accdd2a69074d13ee6..f62c16fab42bf78a663dc3896f0e32fe43abe92f 100644 (file)
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -173,7 +173,6 @@ detach_thermostat(struct i2c_adapter *adapter)
 static struct i2c_driver thermostat_driver = {  
        .owner          = THIS_MODULE,
        .name           = "therm_adt746x",
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = attach_thermostat,
        .detach_adapter = detach_thermostat,
 };

diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index 190878eef9903e1ec8a4c2e938772ab06ae8a0d9..df00c960fc5a3d82f8be401318f23a318e6a50be 100644 (file)
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -285,7 +285,6 @@ static struct i2c_driver therm_pm72_driver =
 {
        .owner          = THIS_MODULE,
        .name           = "therm_pm72",
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = therm_pm72_attach,
        .detach_adapter = therm_pm72_detach,
 };

diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 6aaa1df1a64ed458fb54d2804ce8d6e58b9a08bd..f3bae0d00ed2096105d53d55782fb1a05d9eb2c3 100644 (file)
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -357,7 +357,6 @@ static struct i2c_driver g4fan_driver = {
        .owner          = THIS_MODULE,
        .name           = "therm_windtunnel",
        .id             = I2C_DRIVERID_G4FAN,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = do_attach,
        .detach_client  = do_detach,
 };

diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index a0a41ad0f2b593b7eadf0320b7c121710e9004b6..2392789ccf32633777fe80fb9f13ccd68b4372d2 100644 (file)
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -49,7 +49,6 @@ static int wf_lm75_detach(struct i2c_client *client);
 static struct i2c_driver wf_lm75_driver = {
        .owner          = THIS_MODULE,
        .name           = "wf_lm75",
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = wf_lm75_attach,
        .detach_client  = wf_lm75_detach,
 };

diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 1ca2b67aedfb653c66fc9b35467356d87604274f..c4f2265167a2c1173dade05635f29ba8e5c64e71 100644 (file)
--- 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 173bca1e02950cdd29d340e56474f1da30389fbb..4fc08b17d4d085933d0e420558f3d8e0b29b0560 100644 (file)
--- 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 3ee0afca76a7f1b206a39688648aacbd68e4ae5e..7bba69793b788474b36d87236229d6f5dab962c2 100644 (file)
--- 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 3ca1d768bfd3b4bb4da818725caa5bf9fa0970a8..0ba8652357e222b68f44ae19e04185eca5aa5c35 100644 (file)
--- 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 8eb871d0e85b61cdf1d139d73116bcbd32ff88f8..4c9acd1e2c70c199d4203ebdca36d978a5a4b22e 100644 (file)
--- 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 780b352ec1192c41f4ba6ba7ce15737372f8e2c1..fce5d89b7b1560541c073b0efc949e601c1b3c2d 100644 (file)
--- 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 5b93723a1768ce664cabb7b8071b1cf459585fc4..c66bc147ee715b38453962d37b1a8de7fd6f30ba 100644 (file)
--- 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 deeef125eb92eca9499fac5f06a7b72f7108a8fc..3eba514cdb29fccef17cbc560f1352b7ce4cb422 100644 (file)
--- 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 740e543311af8c1930c8161332cc6a98395d8b59..2e2f78a4afc8b2340982535dd4494c328e7df75d 100644 (file)
--- 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 d86f8e92e53413f60e0e64e575d33b0b87d9011f..46328fb6fe80a5db62149089254c270aa3fd2b3a 100644 (file)
--- 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 2de34ebf0673db67f0785e15a845cf371c4ef4a6..390d0d6c78389cb215044ae94cf0a41cac05d90e 100644 (file)
--- 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 b8054da31ffd2f2036aa209acfe8bb5bdf43ed67..9bf686989aabf815e48f5e6360713f869e500908 100644 (file)
--- 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 7ffa2e9a9bf3b78d2c66af08d11460d240cbf761..811e863960303dc43bce173e5685019bfaa7ad51 100644 (file)
--- 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 923322503e8fb5441ea5f94d55448ba3cfa88f57..18a0b7143e8bc4ce09e1886843904e454fb01a69 100644 (file)
--- 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 e116bdbed310945a3cb51f0975bac25e6776c0c7..f266b35ceb350819dce35b95f04c9bd25f6f306a 100644 (file)
--- 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 fe8a5e45396982ca0a1a62ee2ab6571ca4d7ba23..687beaf11adc261577d916e7f5f2208a0ed4a864 100644 (file)
--- 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 d9f50e2f7b92f1c14997945c465ffdc13fad668c..4748cf0598c0903c4021519e1fcc05bae305a574 100644 (file)
--- 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 e717e30d8187e5cc5927534c147f598589ea1b48..b1079de938b7efecd32d49fc2d09fde9f6096281 100644 (file)
--- 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 31f7b950b01cef303553dbaf5bf45f9e3019e566..734a70919080648d5355a39d615221867fe7879f 100644 (file)
--- 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 c36f014f1fdf21bb63c78521608e64e36a60d251..a2fab98375079c08517147ffcf7c51d13be0ad0d 100644 (file)
--- 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 a61d24f588f7007b7173bd6965cd57fa9decda7a..6fc298e0a03a57e5d6106a3a0617db3bdf6bcab7 100644 (file)
--- 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 132aa7943c1625a7385a15a9d69bbd37b3864a3e..e24aa16f2d8c33e8fa89c0657b3eb926763837c8 100644 (file)
--- 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 cbca896e8cfaa81dfcfaaa39fa665527a040b8ba..6be98fc0fe24ed708f224f8c52446f7164bdc34d 100644 (file)
--- 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 d32737dd21427d8bfed38d1206fc11b5dd272622..239a58666a1219957168b3dd5ef496fb5dacf0fd 100644 (file)
--- 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 1794686612c6dccac93431e3b5f22f1f1c62f9f1..f29fb507075daeb812296bf296f618785be537d5 100644 (file)
--- 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 a5e37dc91f39054e1bdfff22350583540157d2de..d053b6445502761766ca0f5b3895b92649263ec5 100644 (file)
--- 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 2f2414e90e8bbe4bb47c22d803355e2ffacde92e..049b44e0767be20d356df62f2bf5f382730a68fe 100644 (file)
--- 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 ee3688348b662bac1dc06dc7be1893cd537f185d..96d88ce60c984f9c9eeeb301f2f0134848aabbee 100644 (file)
--- 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 17975c19da5ee376f08ba2b7e98b96d4469b519b..fd417de95847d2f54e2c280bf0be9a70b8c7b18c 100644 (file)
--- 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 79203595b9c13456d09c7c700b3127f16ed52734..3505cec2e65a2bd508c00d60f198f4894909159e 100644 (file)
--- 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 e58abdfcaab8bcfc5c64adf572fb55818ef785a5..3c75121f638344200ddf3f63f0ee5385feb10be7 100644 (file)
--- 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 5b20e8177cad4942cb21d47d956570d46735c5ed..3565f35be7a1594103906224706aa70944274fbe 100644 (file)
--- 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 5ac235365dd810b2a59f42e74b302685c546f22d..195bc51d4576c713d98d5bdada7ffd3a5c0a127d 100644 (file)
--- 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 5897e5d4d3d2793147d9a8ef6c822e0e41a78c9e..936e01d2c785b25e65b7d108b9e0b887940fce3f 100644 (file)
--- 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 97431e26d22905707be2fae0216d3ab30af06e82..4f3ee2091611835e5c791dc1d422d4618d61ce5d 100644 (file)
--- 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 137b58f2c666aae638c0199e95bfac15a5576149..c66d28505bcdf687251d951b768852481f84a027 100644 (file)
--- 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 a6936ad74fcf49073bc635aba17c84dd09dd262a..7b07717a3c678d5264a586fc26f137404d3f0ace 100644 (file)
--- 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,

diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index ad60bbb16cdf0dedd14d69333c025dd19718f2a3..78994c5fe932434101b45e7847c326c2f4d6eb1b 100644 (file)
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -1296,7 +1296,6 @@ static struct i2c_driver maven_driver={
        .owner          = THIS_MODULE,
        .name           = "maven",
        .id             = I2C_DRIVERID_MGATVO,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = maven_attach_adapter,
        .detach_client  = maven_detach_client,
        .command        = maven_command,

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 0316ba1294ca719ca9404526a1bbd41ddfb49bed..99399fadf13f223b53a99380a0c70ba2428321c3 100644 (file)
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -251,7 +251,6 @@ static inline void i2c_set_adapdata (struct i2c_adapter *dev, void *data)
 }
 
 /*flags for the driver struct: */
-#define I2C_DF_NOTIFY  0x01            /* notify on bus (de/a)ttaches  */
 
 /*flags for the client struct: */
 #define I2C_CLIENT_ALLOW_USE           0x01    /* Client allows access */

diff --git a/sound/oss/dmasound/dac3550a.c b/sound/oss/dmasound/dac3550a.c
index 533895eba0ebcd2932d5ba2481fe4ea36dce3d67..3402a663d07fb46abe5eb6112641db9c3294272d 100644 (file)
--- a/sound/oss/dmasound/dac3550a.c
+++ b/sound/oss/dmasound/dac3550a.c
@@ -44,7 +44,6 @@ struct i2c_driver daca_driver = {
        .owner                  = THIS_MODULE,
        .name                   = "DAC3550A driver  V " DACA_VERSION,
        .id                     = I2C_DRIVERID_DACA,
-       .flags                  = I2C_DF_NOTIFY,
        .attach_adapter         = daca_attach_adapter,
        .detach_client          = daca_detach_client,
 };

diff --git a/sound/oss/dmasound/tas_common.c b/sound/oss/dmasound/tas_common.c
index d36a1fe2fcf34a93f8d8a9bbe2677a683a449ccb..7e3d517af4b9acf285a40298a0967dcf2f96a0ef 100644 (file)
--- a/sound/oss/dmasound/tas_common.c
+++ b/sound/oss/dmasound/tas_common.c
@@ -49,7 +49,6 @@ static int tas_detach_client(struct i2c_client *);
 struct i2c_driver tas_driver = {
        .owner          = THIS_MODULE,
        .name           = "tas",
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = tas_attach_adapter,
        .detach_client  = tas_detach_client,
 };

diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c
index 097fbcfc5d4589059d6c3ca49e7c607456c9f0b0..fd8e2e6062f68184b43620bd2266be4d675ada8c 100644 (file)
--- a/sound/ppc/keywest.c
+++ b/sound/ppc/keywest.c
@@ -43,7 +43,6 @@ static int keywest_detach_client(struct i2c_client *client);
 struct i2c_driver keywest_driver = {  
        .name = "PMac Keywest Audio",
        .id = I2C_DRIVERID_KEYWEST,
-       .flags = I2C_DF_NOTIFY,
        .attach_adapter = &keywest_attach_adapter,
        .detach_client = &keywest_detach_client,
 };