Skip to content

Commit

Permalink
[PATCH] i2c: Drop i2c_driver.{owner,name}, 4 of 11
Browse files Browse the repository at this point in the history
We should use the i2c_driver.driver's .name and .owner fields
instead of the i2c_driver's ones.

This patch updates the drivers for macintosh.

Signed-off-by: Laurent Riffard <laurent.riffard@free.fr>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Laurent Riffard authored and Greg Kroah-Hartman committed Jan 6, 2006
1 parent cdaf793 commit a33ca23
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 8 deletions.
6 changes: 4 additions & 2 deletions drivers/macintosh/therm_adt746x.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,10 @@ detach_thermostat(struct i2c_adapter *adapter)
}

static struct i2c_driver thermostat_driver = {
.owner = THIS_MODULE,
.name = "therm_adt746x",
.driver = {
.owner = THIS_MODULE,
.name = "therm_adt746x",
},
.attach_adapter = attach_thermostat,
.detach_adapter = detach_thermostat,
};
Expand Down
6 changes: 4 additions & 2 deletions drivers/macintosh/therm_pm72.c
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,10 @@ static int therm_pm72_detach(struct i2c_adapter *adapter);

static struct i2c_driver therm_pm72_driver =
{
.owner = THIS_MODULE,
.name = "therm_pm72",
.driver = {
.owner = THIS_MODULE,
.name = "therm_pm72",
},
.attach_adapter = therm_pm72_attach,
.detach_adapter = therm_pm72_detach,
};
Expand Down
6 changes: 4 additions & 2 deletions drivers/macintosh/therm_windtunnel.c
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,10 @@ do_detach( struct i2c_client *client )
}

static struct i2c_driver g4fan_driver = {
.owner = THIS_MODULE,
.name = "therm_windtunnel",
.driver = {
.owner = THIS_MODULE,
.name = "therm_windtunnel",
},
.id = I2C_DRIVERID_G4FAN,
.attach_adapter = do_attach,
.detach_client = do_detach,
Expand Down
6 changes: 4 additions & 2 deletions drivers/macintosh/windfarm_lm75_sensor.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,10 @@ static int wf_lm75_attach(struct i2c_adapter *adapter);
static int wf_lm75_detach(struct i2c_client *client);

static struct i2c_driver wf_lm75_driver = {
.owner = THIS_MODULE,
.name = "wf_lm75",
.driver = {
.owner = THIS_MODULE,
.name = "wf_lm75",
},
.attach_adapter = wf_lm75_attach,
.detach_client = wf_lm75_detach,
};
Expand Down

0 comments on commit a33ca23

Please sign in to comment.