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

1 files changed, 2 insertions, 2 deletions

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);