diff options
| author | Jean Delvare <khali@linux-fr.org> | 2005-07-20 01:56:35 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 20:14:10 +0400 |
| commit | 2d8672c5a6ba0d3f1d8d3ad61ef67868941364f0 (patch) | |
| tree | f01f038198bad63fee4c7d23af806ad0ab4e5071 /drivers/hwmon/lm78.c | |
| parent | 5042c7d752fe72c6924037058367f63902e68c5c (diff) | |
| download | linux-2d8672c5a6ba0d3f1d8d3ad61ef67868941364f0.tar.xz | |
[PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (5/9)
Call the ISA chip drivers detection function directly instead of relying
on i2c_detect. The net effect is that address lists won't be handled
anymore, but they were mostly useless in the ISA case anyway (pc87360,
smsc47m1, smsc47b397 had already dropped them).
We don't need to handle multiple devices, all we may need is a way to
force a given address instead of the original one (some drivers already
do: sis5595, via686a, w83627hf), and, for drivers supporting multiple
chips, a way to force one given kind. All this may be added later on
demand, but I actually don't think there will be much demand.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/hwmon/lm78.c')
| -rw-r--r-- | drivers/hwmon/lm78.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c index a69e7d4670ad..c3712f8d9964 100644 --- a/drivers/hwmon/lm78.c +++ b/drivers/hwmon/lm78.c @@ -34,7 +34,8 @@ static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END }; -static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END }; +static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; +static unsigned short isa_address = 0x290; /* Insmod parameters */ SENSORS_INSMOD_2(lm78, lm79); @@ -160,6 +161,7 @@ struct lm78_data { static int lm78_attach_adapter(struct i2c_adapter *adapter); +static int lm78_isa_attach_adapter(struct i2c_adapter *adapter); static int lm78_detect(struct i2c_adapter *adapter, int address, int kind); static int lm78_detach_client(struct i2c_client *client); @@ -181,7 +183,7 @@ static struct i2c_driver lm78_driver = { static struct i2c_driver lm78_isa_driver = { .owner = THIS_MODULE, .name = "lm78-isa", - .attach_adapter = lm78_attach_adapter, + .attach_adapter = lm78_isa_attach_adapter, .detach_client = lm78_detach_client, }; @@ -480,6 +482,11 @@ static int lm78_attach_adapter(struct i2c_adapter *adapter) return i2c_detect(adapter, &addr_data, lm78_detect); } +static int lm78_isa_attach_adapter(struct i2c_adapter *adapter) +{ + return lm78_detect(adapter, isa_address, -1); +} + /* This function is called by i2c_detect */ int lm78_detect(struct i2c_adapter *adapter, int address, int kind) { |