diff options
| -rw-r--r-- | drivers/macintosh/therm_adt746x.c | 11 | ||||
| -rw-r--r-- | drivers/macintosh/therm_pm72.c | 3 | ||||
| -rw-r--r-- | drivers/macintosh/therm_windtunnel.c | 8 |
3 files changed, 10 insertions, 12 deletions
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c index d7285e08ada5..cce6b3642726 100644 --- a/drivers/macintosh/therm_adt746x.c +++ b/drivers/macintosh/therm_adt746x.c @@ -170,11 +170,11 @@ detach_thermostat(struct i2c_adapter *adapter) } static struct i2c_driver thermostat_driver = { - .name ="Apple Thermostat ADT746x", - .id =0xDEAD7467, - .flags =I2C_DF_NOTIFY, - .attach_adapter =&attach_thermostat, - .detach_adapter =&detach_thermostat, + .owner = THIS_MODULE, + .name = "therm_adt746x", + .flags = I2C_DF_NOTIFY, + .attach_adapter = attach_thermostat, + .detach_adapter = detach_thermostat, }; static int read_fan_speed(struct thermostat *th, u8 addr) @@ -381,7 +381,6 @@ static int attach_one_thermostat(struct i2c_adapter *adapter, int addr, th->clt.addr = addr; th->clt.adapter = adapter; th->clt.driver = &thermostat_driver; - th->clt.id = 0xDEAD7467; strcpy(th->clt.name, "thermostat"); rc = read_reg(th, 0); diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c index 5728f063ed0f..3c606ef98170 100644 --- a/drivers/macintosh/therm_pm72.c +++ b/drivers/macintosh/therm_pm72.c @@ -235,8 +235,8 @@ static int therm_pm72_detach(struct i2c_adapter *adapter); static struct i2c_driver therm_pm72_driver = { + .owner = THIS_MODULE, .name = "therm_pm72", - .id = 0xDEADBEEF, .flags = I2C_DF_NOTIFY, .attach_adapter = therm_pm72_attach, .detach_adapter = therm_pm72_detach, @@ -266,7 +266,6 @@ static struct i2c_client *attach_i2c_chip(int id, const char *name) clt->addr = (id >> 1) & 0x7f; clt->adapter = adap; clt->driver = &therm_pm72_driver; - clt->id = 0xDEADBEEF; strncpy(clt->name, name, I2C_NAME_SIZE-1); if (i2c_attach_client(clt)) { diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c index 7dbc5cb4d7ee..897902b82f75 100644 --- a/drivers/macintosh/therm_windtunnel.c +++ b/drivers/macintosh/therm_windtunnel.c @@ -353,12 +353,12 @@ do_detach( struct i2c_client *client ) } static struct i2c_driver g4fan_driver = { - .name = "Apple G4 Thermostat/Fan", + .owner = THIS_MODULE, + .name = "therm_windtunnel", .id = I2C_DRIVERID_G4FAN, .flags = I2C_DF_NOTIFY, - .attach_adapter = &do_attach, - .detach_client = &do_detach, - .command = NULL, + .attach_adapter = do_attach, + .detach_client = do_detach, }; static int |