i2c: Kill rogue driver IDs

I2C driver IDs are optional, so if you don't need one, just omit it.

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

diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 7c57e7a4e00fc64842f22d200e376b3d365fcee6..b66da74caa55b868c8a9ba401942e7ceebab9abd 100644 (file)
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -47,8 +47,6 @@
 
 #define LOG_TEMP               0                       /* continously log temperature */
 
-#define I2C_DRIVERID_G4FAN     0x9001                  /* fixme */
-
 static int                     do_probe( struct i2c_adapter *adapter, int addr, int kind);
 
 /* scan 0x48-0x4f (DS1775) and 0x2c-2x2f (ADM1030) */
@@ -357,7 +355,6 @@ static struct i2c_driver g4fan_driver = {
        .driver = {
                .name   = "therm_windtunnel",
        },
-       .id             = I2C_DRIVERID_G4FAN,
        .attach_adapter = do_attach,
        .detach_client  = do_detach,
 };

diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c
index 642733d091faa1140ae4b37b8b71b2576ed1baa9..6c52c66b659f8333b36af35d6d27118845dbc03c 100644 (file)
--- a/drivers/usb/host/ohci-pnx4008.c
+++ b/drivers/usb/host/ohci-pnx4008.c
@@ -123,7 +123,6 @@ static struct i2c_client_address_data addr_data = {
 };
 
 struct i2c_driver isp1301_driver = {
-       .id = I2C_DRIVERID_I2CDEV,      /* Fake Id */
        .class = I2C_CLASS_HWMON,
        .attach_adapter = isp1301_probe,
        .detach_client = isp1301_detach,

diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c
index 272ae38e9b1883154f7574000270a23b84d48b84..bb7d744faff5891dd66f3c21cc0932b61306dfcd 100644 (file)
--- a/sound/ppc/keywest.c
+++ b/sound/ppc/keywest.c
@@ -34,8 +34,6 @@
 static struct pmac_keywest *keywest_ctx;
 
 
-#define I2C_DRIVERID_KEYWEST   0xFEBA
-
 static int keywest_attach_adapter(struct i2c_adapter *adapter);
 static int keywest_detach_client(struct i2c_client *client);
 
@@ -43,7 +41,6 @@ struct i2c_driver keywest_driver = {
        .driver = {
                .name = "PMac Keywest Audio",
        },
-       .id = I2C_DRIVERID_KEYWEST,
        .attach_adapter = &keywest_attach_adapter,
        .detach_client = &keywest_detach_client,
 };