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

The I2C_DF_DUMMY flag is gone since 2.5.70, it's about time to
drop all ifdef'd out references thereto.

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

diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 8318bd1..5897e5d 100644 (file)
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -232,12 +232,8 @@ static struct i2c_driver driver = {
 #endif
        .name            = "tv card mixer driver",
        .id              = I2C_DRIVERID_TVMIXER,
-#ifdef I2C_DF_DUMMY
-       .flags           = I2C_DF_DUMMY,
-#else
        .flags           = I2C_DF_NOTIFY,
        .detach_adapter  = tvmixer_adapters,
-#endif
        .attach_adapter  = tvmixer_adapters,
        .detach_client   = tvmixer_clients,
 };

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 5e19a7b..0316ba1 100644 (file)
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -252,11 +252,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  */
-#if 0
-/* this flag is gone -- there is a (optional) driver->detach_adapter
- * callback now which can be used instead */
-# define I2C_DF_DUMMY  0x02
-#endif
 
 /*flags for the client struct: */
 #define I2C_CLIENT_ALLOW_USE           0x01    /* Client allows access */