ARM: OMAP: Misc I2C compile fixes

Misc I2C compile fixes

diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index b067858f1bf9e3dd472effd9d0b1f982005127e4..7770171ab96829c59839d3fb408692a23e79a74d 100644 (file)
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -49,7 +49,7 @@
 
 
 #define        DRIVER_VERSION  "24 August 2004"
-#define        DRIVER_NAME     (isp1301_driver.name)
+#define        DRIVER_NAME     (isp1301_driver.driver.name)
 
 MODULE_DESCRIPTION("ISP1301 USB OTG Transceiver Driver");
 MODULE_LICENSE("GPL");

diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index 48c3e3701f294f53894c360f772d46a3c9b9a18a..3fc037483c06afe1519295a25e8ae5311df34872 100644 (file)
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -450,11 +450,11 @@ static int menelaus_scan_bus(struct i2c_adapter *bus)
 }
 
 static struct i2c_driver menelaus_i2c_driver = {
-       .owner          = THIS_MODULE,
-       .name           = DRIVER_NAME,
-       .id             = I2C_DRIVERID_EXP0, /*FIXME:accroding to i2c-ids.h */
+       .driver {
+               .name           = DRIVER_NAME,
+       },
+       .id             = I2C_DRIVERID_MISC, /*FIXME:accroding to i2c-ids.h */
        .class          = I2C_CLASS_HWMON,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = menelaus_scan_bus,
        .detach_client  = menelaus_remove,
 };

diff --git a/drivers/i2c/chips/tlv320aic23.c b/drivers/i2c/chips/tlv320aic23.c
index 43c4bac5b53f035d8e3eb1787f98b44a77b9397d..097bf8f5a4403506e929b1cb76bb69f3a5d4acb8 100644 (file)
--- a/drivers/i2c/chips/tlv320aic23.c
+++ b/drivers/i2c/chips/tlv320aic23.c
@@ -125,10 +125,10 @@ static int tlv320aic23_attach_adapter(struct i2c_adapter *adapter)
 /*-----------------------------------------------------------------------*/
 
 static struct i2c_driver tlv320aic23_driver = {
-       .owner          = THIS_MODULE, 
-        .name           = "OMAP+TLV320AIC23 codec",
-        .id            = I2C_DRIVERID_EXP0,           /* Experimental ID */
-        .flags         = I2C_DF_NOTIFY,
+       .driver {
+               .name           = "OMAP+TLV320AIC23 codec",
+       },
+        .id            = I2C_DRIVERID_MISC,           /* Experimental ID */
         .attach_adapter        = tlv320aic23_attach_adapter,
         .detach_client = tlv320aic23_detach_client,
 };

diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index f009caa9ef6a9193714fe47eceb8ff5674798018..f8b13206ee798eb6bf803f7bdc78a839e9868c04 100644 (file)
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -44,7 +44,7 @@
 /*-------------------------------------------------------------------------*/
 
 #define        DRIVER_VERSION  "2 May 2005"
-#define        DRIVER_NAME     (tps65010_driver.name)
+#define        DRIVER_NAME     (tps65010_driver.driver.name)
 
 MODULE_DESCRIPTION("TPS6501x Power Management Driver");
 MODULE_LICENSE("GPL");
@@ -641,10 +641,10 @@ static int __init tps65010_scan_bus(struct i2c_adapter *bus)
 }
 
 static struct i2c_driver tps65010_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "tps65010",
+       .driver = {
+               .name           = "tps65010",
+       },
        .id             = 888,          /* FIXME assign "official" value */
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = tps65010_scan_bus,
        .detach_client  = __exit_p(tps65010_detach_client),
 };

diff --git a/drivers/media/video/omap/sensor_ov9640.c b/drivers/media/video/omap/sensor_ov9640.c
index c7691d19356f9c5d8cb724a924e8bdebaed7fc65..788f41d008aea55a7d8189bb18fdb4d06a977904 100644 (file)
--- a/drivers/media/video/omap/sensor_ov9640.c
+++ b/drivers/media/video/omap/sensor_ov9640.c
@@ -768,7 +768,6 @@ ov9640_i2c_attach_client(struct i2c_adapter *adap, int addr, int probe)
                return -EBUSY;  /* our client is already attached */
 
        client->addr = addr;
-       client->flags = I2C_CLIENT_ALLOW_USE;
        client->driver = &sensor->driver;
        client->adapter = adap;
 
@@ -1109,10 +1108,8 @@ ov9640sensor_init(struct v4l2_pix_format *pix)
        if (ov9640_powerup())
                return NULL;
 
-       driver->owner = THIS_MODULE;
-       strlcpy(driver->name, "OV9640 I2C driver", sizeof(driver->name));
-       driver->id = I2C_DRIVERID_EXP0;
-       driver->flags = I2C_DF_NOTIFY;
+       strlcpy(driver->driver.name, "OV9640 I2C driver", sizeof(driver->driver.name));
+       driver->id = I2C_DRIVERID_MISC;
        driver->attach_adapter = ov9640_i2c_probe_adapter;
        driver->detach_client = ov9640_i2c_detach_client;
 

diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 6ff2d365895f550e72fc6e94a54696d3467573ea..2a0ddb0e57845c310a01fc5fc3270e3fdde7f69c 100644 (file)
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -105,6 +105,8 @@
 #define I2C_DRIVERID_INFRARED  75      /* I2C InfraRed on Video boards */
 #define I2C_DRIVERID_TVP5150   76      /* TVP5150 video decoder        */
 
+#define I2C_DRIVERID_MISC      99      /* Whatever until sorted out    */
+
 #define I2C_DRIVERID_I2CDEV    900
 #define I2C_DRIVERID_ARP        902    /* SMBus ARP Client              */
 #define I2C_DRIVERID_ALERT      903    /* SMBus Alert Responder Client  */