diff options
author | Jean Delvare <khali@linux-fr.org> | 2008-01-27 12:14:47 -0500 |
---|---|---|
committer | Jean Delvare <khali@hyperion.delvare> | 2008-01-27 12:14:47 -0500 |
commit | 05c7abaeb344975a3257366a52368a4866aa518d (patch) | |
tree | 594b2f2f987fca4cda9ac98db87abb2f47af24e6 | |
parent | 2cdddeb8d7dd42dc1847b110228a626d25a1e468 (diff) |
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>
-rw-r--r-- | drivers/macintosh/therm_windtunnel.c | 3 | ||||
-rw-r--r-- | drivers/usb/host/ohci-pnx4008.c | 1 | ||||
-rw-r--r-- | sound/ppc/keywest.c | 3 |
3 files changed, 0 insertions, 7 deletions
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c index 7c57e7a4e00f..b66da74caa55 100644 --- a/drivers/macintosh/therm_windtunnel.c +++ b/drivers/macintosh/therm_windtunnel.c | |||
@@ -47,8 +47,6 @@ | |||
47 | 47 | ||
48 | #define LOG_TEMP 0 /* continously log temperature */ | 48 | #define LOG_TEMP 0 /* continously log temperature */ |
49 | 49 | ||
50 | #define I2C_DRIVERID_G4FAN 0x9001 /* fixme */ | ||
51 | |||
52 | static int do_probe( struct i2c_adapter *adapter, int addr, int kind); | 50 | static int do_probe( struct i2c_adapter *adapter, int addr, int kind); |
53 | 51 | ||
54 | /* scan 0x48-0x4f (DS1775) and 0x2c-2x2f (ADM1030) */ | 52 | /* scan 0x48-0x4f (DS1775) and 0x2c-2x2f (ADM1030) */ |
@@ -357,7 +355,6 @@ static struct i2c_driver g4fan_driver = { | |||
357 | .driver = { | 355 | .driver = { |
358 | .name = "therm_windtunnel", | 356 | .name = "therm_windtunnel", |
359 | }, | 357 | }, |
360 | .id = I2C_DRIVERID_G4FAN, | ||
361 | .attach_adapter = do_attach, | 358 | .attach_adapter = do_attach, |
362 | .detach_client = do_detach, | 359 | .detach_client = do_detach, |
363 | }; | 360 | }; |
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c index 642733d091fa..6c52c66b659f 100644 --- 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 = { | |||
123 | }; | 123 | }; |
124 | 124 | ||
125 | struct i2c_driver isp1301_driver = { | 125 | struct i2c_driver isp1301_driver = { |
126 | .id = I2C_DRIVERID_I2CDEV, /* Fake Id */ | ||
127 | .class = I2C_CLASS_HWMON, | 126 | .class = I2C_CLASS_HWMON, |
128 | .attach_adapter = isp1301_probe, | 127 | .attach_adapter = isp1301_probe, |
129 | .detach_client = isp1301_detach, | 128 | .detach_client = isp1301_detach, |
diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c index 272ae38e9b18..bb7d744faff5 100644 --- a/sound/ppc/keywest.c +++ b/sound/ppc/keywest.c | |||
@@ -34,8 +34,6 @@ | |||
34 | static struct pmac_keywest *keywest_ctx; | 34 | static struct pmac_keywest *keywest_ctx; |
35 | 35 | ||
36 | 36 | ||
37 | #define I2C_DRIVERID_KEYWEST 0xFEBA | ||
38 | |||
39 | static int keywest_attach_adapter(struct i2c_adapter *adapter); | 37 | static int keywest_attach_adapter(struct i2c_adapter *adapter); |
40 | static int keywest_detach_client(struct i2c_client *client); | 38 | static int keywest_detach_client(struct i2c_client *client); |
41 | 39 | ||
@@ -43,7 +41,6 @@ struct i2c_driver keywest_driver = { | |||
43 | .driver = { | 41 | .driver = { |
44 | .name = "PMac Keywest Audio", | 42 | .name = "PMac Keywest Audio", |
45 | }, | 43 | }, |
46 | .id = I2C_DRIVERID_KEYWEST, | ||
47 | .attach_adapter = &keywest_attach_adapter, | 44 | .attach_adapter = &keywest_attach_adapter, |
48 | .detach_client = &keywest_detach_client, | 45 | .detach_client = &keywest_detach_client, |
49 | }; | 46 | }; |