i2c: Drop I2C_CLASS_CAM_DIGITAL

There are a number of drivers which set their i2c bus class to
I2C_CLASS_CAM_DIGITAL, however no chip driver actually checks for this
flag, so we might as well drop it now.

Signed-off-by: Jean Delvare <khali@linux-fr.org>

diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 34a39d2e4703843bc7a0dfd2dc9431f5de149907..46fd573a4f1511594213c01525d10fb5a9f64b04 100644 (file)
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -569,7 +569,6 @@ static int cafe_smbus_setup(struct cafe_camera *cam)
 
        cafe_smbus_enable_irq(cam);
        adap->id = I2C_HW_SMBUS_CAFE;
-       adap->class = I2C_CLASS_CAM_DIGITAL;
        adap->owner = THIS_MODULE;
        adap->client_register = cafe_smbus_attach;
        adap->client_unregister = cafe_smbus_detach;

diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c
index ca26b0c50cf2ab94095e0856f1183974fba3a918..05c14a29375ae6f921899b0ce28db21f218c39c0 100644 (file)
--- a/drivers/media/video/ov7670.c
+++ b/drivers/media/video/ov7670.c
@@ -1347,7 +1347,6 @@ static struct i2c_driver ov7670_driver = {
                .name = "ov7670",
        },
        .id             = I2C_DRIVERID_OV7670,
-       .class          = I2C_CLASS_CAM_DIGITAL,
        .attach_adapter = ov7670_attach,
        .detach_client  = ov7670_detach,
        .command        = ov7670_command,

diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 2c4acbf5a4feae2f5f425c8d9f8b925ec4cdcbd9..c841f4e4fbe4903d45f1877e982c9aaebda7e73e 100644 (file)
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -405,7 +405,6 @@ static struct i2c_driver driver = {
                .name =         "ovcamchip",
        },
        .id =                   I2C_DRIVERID_OVCAMCHIP,
-       .class =                I2C_CLASS_CAM_DIGITAL,
        .attach_adapter =       ovcamchip_attach,
        .detach_client =        ovcamchip_detach,
        .command =              ovcamchip_command,

diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c
index a3997b7d4366049d9ce20e446e67fb47f0bececf..105a832531f2529a61a6c45cbb0855f79b514bfa 100644 (file)
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -1553,7 +1553,6 @@ static int w9968cf_i2c_init(struct w9968cf_device* cam)
 
        static struct i2c_adapter adap = {
                .id =                I2C_HW_SMBUS_W9968CF,
-               .class =             I2C_CLASS_CAM_DIGITAL,
                .owner =             THIS_MODULE,
                .client_register =   w9968cf_i2c_attach_inform,
                .client_unregister = w9968cf_i2c_detach_inform,

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 4fd79d2e4021394e01c635c348bf46d499b2d6b2..20873d402467c6dea8d5425092b945f78e9ea31b 100644 (file)
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -393,7 +393,6 @@ static inline void i2c_set_adapdata(struct i2c_adapter *dev, void *data)
 #define I2C_CLASS_TV_ANALOG    (1<<1)  /* bttv + friends */
 #define I2C_CLASS_TV_DIGITAL   (1<<2)  /* dvb cards */
 #define I2C_CLASS_DDC          (1<<3)  /* DDC bus on graphics adapters */
-#define I2C_CLASS_CAM_DIGITAL  (1<<5)  /* most webcams */
 #define I2C_CLASS_SPD          (1<<7)  /* SPD EEPROMs and similar */
 
 /* i2c_client_address_data is the struct for holding default client