diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-07-19 23:56:35 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 09:14:10 -0700 |
commit | 2d8672c5a6ba0d3f1d8d3ad61ef67868941364f0 (patch) | |
tree | f01f038198bad63fee4c7d23af806ad0ab4e5071 /drivers/hwmon/w83627ehf.c | |
parent | 5042c7d752fe72c6924037058367f63902e68c5c (diff) | |
download | linux-stable-2d8672c5a6ba0d3f1d8d3ad61ef67868941364f0.tar.gz linux-stable-2d8672c5a6ba0d3f1d8d3ad61ef67868941364f0.tar.bz2 linux-stable-2d8672c5a6ba0d3f1d8d3ad61ef67868941364f0.zip |
[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/w83627ehf.c')
-rw-r--r-- | drivers/hwmon/w83627ehf.c | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c index a3c642ef5c42..b14801cd615d 100644 --- a/drivers/hwmon/w83627ehf.c +++ b/drivers/hwmon/w83627ehf.c @@ -41,19 +41,13 @@ #include <linux/slab.h> #include <linux/i2c.h> #include <linux/i2c-isa.h> -#include <linux/i2c-sensor.h> #include <linux/hwmon.h> #include <linux/err.h> #include <asm/io.h> #include "lm75.h" -/* Addresses to scan - The actual ISA address is read from Super-I/O configuration space */ -static unsigned short normal_i2c[] = { I2C_CLIENT_END }; -static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END }; - -/* Insmod parameters */ -SENSORS_INSMOD_1(w83627ehf); +/* The actual ISA address is read from Super-I/O configuration space */ +static unsigned short address; /* * Super-I/O constants and functions @@ -673,15 +667,12 @@ static void w83627ehf_init_client(struct i2c_client *client) } } -static int w83627ehf_detect(struct i2c_adapter *adapter, int address, int kind) +static int w83627ehf_detect(struct i2c_adapter *adapter) { struct i2c_client *client; struct w83627ehf_data *data; int i, err = 0; - if (!i2c_is_isa_adapter(adapter)) - return 0; - if (!request_region(address, REGION_LENGTH, w83627ehf_driver.name)) { err = -EBUSY; goto exit; @@ -776,13 +767,6 @@ exit: return err; } -static int w83627ehf_attach_adapter(struct i2c_adapter *adapter) -{ - if (!(adapter->class & I2C_CLASS_HWMON)) - return 0; - return i2c_detect(adapter, &addr_data, w83627ehf_detect); -} - static int w83627ehf_detach_client(struct i2c_client *client) { struct w83627ehf_data *data = i2c_get_clientdata(client); @@ -804,12 +788,11 @@ static int w83627ehf_detach_client(struct i2c_client *client) static struct i2c_driver w83627ehf_driver = { .owner = THIS_MODULE, .name = "w83627ehf", - .flags = I2C_DF_NOTIFY, - .attach_adapter = w83627ehf_attach_adapter, + .attach_adapter = w83627ehf_detect, .detach_client = w83627ehf_detach_client, }; -static int __init w83627ehf_find(int sioaddr, int *address) +static int __init w83627ehf_find(int sioaddr, unsigned short *addr) { u16 val; @@ -827,8 +810,8 @@ static int __init w83627ehf_find(int sioaddr, int *address) superio_select(W83627EHF_LD_HWM); val = (superio_inb(SIO_REG_ADDR) << 8) | superio_inb(SIO_REG_ADDR + 1); - *address = val & ~(REGION_LENGTH - 1); - if (*address == 0) { + *addr = val & ~(REGION_LENGTH - 1); + if (*addr == 0) { superio_exit(); return -ENODEV; } @@ -844,8 +827,8 @@ static int __init w83627ehf_find(int sioaddr, int *address) static int __init sensors_w83627ehf_init(void) { - if (w83627ehf_find(0x2e, &normal_isa[0]) - && w83627ehf_find(0x4e, &normal_isa[0])) + if (w83627ehf_find(0x2e, &address) + && w83627ehf_find(0x4e, &address)) return -ENODEV; return i2c_isa_add_driver(&w83627ehf_driver); |