14 files changed, 2 insertions, 15 deletions

diff --git a/drivers/i2c/chips/ds1337.c b/drivers/i2c/chips/ds1337.c
index 18228957606c..65146cbc8390 100644
--- 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 da488b735abf..5a270d60b699 100644
--- 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 4baf573fa04f..9bb1f8b3f38c 100644
--- 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 d2a100d77839..4f472ba66a02 100644
--- 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 3df309ae44a6..13e67836b348 100644
--- 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 b376a006883c..7e61019e72dd 100644
--- 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 59a930346229..26feb7a4f942 100644
--- 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 c323c2de236c..2fae640cf329 100644
--- 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 ce420a67560b..8750f71278e1 100644
--- 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 26e498d921da..e586f75dd024 100644
--- 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 280dd7a45db6..439bf6ceb789 100644
--- 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 7da366cdc18c..c5ff2cee15ae 100644
--- 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 82ea1b7ec914..ad68ac00d910 100644
--- 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 8af0bd1424d2..9da51eb37c06 100644
--- 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,