Commit b589eb2f authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman

[PATCH] I2C: macintoch/therm_* drivers cleanups

This patch cleans the macintoch/therm_* drivers a bit. It removes
useless IDs, cleans names (no white space), some coding style fixes as
well, etc. It's exactly the same as what I posted yesterday as a
candidate fix to bug #3823:
http://bugzilla.kernel.org/show_bug.cgi?id=3823

Although it isn't the proper fix for that bug, as you underlined, this
still sounds like a sane set of cleanups for these drivers.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent fd2489f5
...@@ -170,11 +170,11 @@ detach_thermostat(struct i2c_adapter *adapter) ...@@ -170,11 +170,11 @@ detach_thermostat(struct i2c_adapter *adapter)
} }
static struct i2c_driver thermostat_driver = { static struct i2c_driver thermostat_driver = {
.name ="Apple Thermostat ADT746x", .owner = THIS_MODULE,
.id =0xDEAD7467, .name = "therm_adt746x",
.flags =I2C_DF_NOTIFY, .flags = I2C_DF_NOTIFY,
.attach_adapter =&attach_thermostat, .attach_adapter = attach_thermostat,
.detach_adapter =&detach_thermostat, .detach_adapter = detach_thermostat,
}; };
static int read_fan_speed(struct thermostat *th, u8 addr) 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, ...@@ -381,7 +381,6 @@ static int attach_one_thermostat(struct i2c_adapter *adapter, int addr,
th->clt.addr = addr; th->clt.addr = addr;
th->clt.adapter = adapter; th->clt.adapter = adapter;
th->clt.driver = &thermostat_driver; th->clt.driver = &thermostat_driver;
th->clt.id = 0xDEAD7467;
strcpy(th->clt.name, "thermostat"); strcpy(th->clt.name, "thermostat");
rc = read_reg(th, 0); rc = read_reg(th, 0);
......
...@@ -235,8 +235,8 @@ static int therm_pm72_detach(struct i2c_adapter *adapter); ...@@ -235,8 +235,8 @@ static int therm_pm72_detach(struct i2c_adapter *adapter);
static struct i2c_driver therm_pm72_driver = static struct i2c_driver therm_pm72_driver =
{ {
.owner = THIS_MODULE,
.name = "therm_pm72", .name = "therm_pm72",
.id = 0xDEADBEEF,
.flags = I2C_DF_NOTIFY, .flags = I2C_DF_NOTIFY,
.attach_adapter = therm_pm72_attach, .attach_adapter = therm_pm72_attach,
.detach_adapter = therm_pm72_detach, .detach_adapter = therm_pm72_detach,
...@@ -266,7 +266,6 @@ static struct i2c_client *attach_i2c_chip(int id, const char *name) ...@@ -266,7 +266,6 @@ static struct i2c_client *attach_i2c_chip(int id, const char *name)
clt->addr = (id >> 1) & 0x7f; clt->addr = (id >> 1) & 0x7f;
clt->adapter = adap; clt->adapter = adap;
clt->driver = &therm_pm72_driver; clt->driver = &therm_pm72_driver;
clt->id = 0xDEADBEEF;
strncpy(clt->name, name, I2C_NAME_SIZE-1); strncpy(clt->name, name, I2C_NAME_SIZE-1);
if (i2c_attach_client(clt)) { if (i2c_attach_client(clt)) {
......
...@@ -353,12 +353,12 @@ do_detach( struct i2c_client *client ) ...@@ -353,12 +353,12 @@ do_detach( struct i2c_client *client )
} }
static struct i2c_driver g4fan_driver = { static struct i2c_driver g4fan_driver = {
.name = "Apple G4 Thermostat/Fan", .owner = THIS_MODULE,
.name = "therm_windtunnel",
.id = I2C_DRIVERID_G4FAN, .id = I2C_DRIVERID_G4FAN,
.flags = I2C_DF_NOTIFY, .flags = I2C_DF_NOTIFY,
.attach_adapter = &do_attach, .attach_adapter = do_attach,
.detach_client = &do_detach, .detach_client = do_detach,
.command = NULL,
}; };
static int static int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment