Subject: 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 --- drivers/macintosh/therm_windtunnel.c | 3 --- drivers/usb/host/ohci-pnx4008.c | 1 - sound/ppc/keywest.c | 3 --- 3 files changed, 7 deletions(-) --- linux-2.6.24-rc3.orig/drivers/macintosh/therm_windtunnel.c 2007-11-21 14:57:06.000000000 +0100 +++ linux-2.6.24-rc3/drivers/macintosh/therm_windtunnel.c 2007-11-21 16:30:41.000000000 +0100 @@ -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, }; --- linux-2.6.24-rc3.orig/drivers/usb/host/ohci-pnx4008.c 2007-11-21 14:57:06.000000000 +0100 +++ linux-2.6.24-rc3/drivers/usb/host/ohci-pnx4008.c 2007-11-21 16:29:17.000000000 +0100 @@ -123,7 +123,6 @@ static struct i2c_client_address_data ad }; struct i2c_driver isp1301_driver = { - .id = I2C_DRIVERID_I2CDEV, /* Fake Id */ .class = I2C_CLASS_HWMON, .attach_adapter = isp1301_probe, .detach_client = isp1301_detach, --- linux-2.6.24-rc3.orig/sound/ppc/keywest.c 2007-02-04 19:44:54.000000000 +0100 +++ linux-2.6.24-rc3/sound/ppc/keywest.c 2007-11-21 16:29:04.000000000 +0100 @@ -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, };