aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/via686a.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2005-07-19 17:51:07 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-05 12:14:09 -0400
commitfde0950903ce8cc38a91dd095280decceda2ff82 (patch)
tree5a970459793ac46ad7082f0d722616730b0589c2 /drivers/hwmon/via686a.c
parent400c455eaa0d0819d18cd42a74070e0e238a73dc (diff)
[PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (3/9)
Convert the 10 ISA hardware monitoring drivers (it87, lm78, pc87360, sis5595, smsc47b397, smsc47m1, via686a, w83627hf, w83627ehf, w83781d) to explicitely register with i2c-isa. For hybrid drivers (it87, lm78, w83781d), we now have two separate instances of i2c_driver, one for the I2C interface of the chip, and one for ISA interface. In the long run, the one for ISA will be replaced with a different driver type. At this point, all drivers are working again, except for missing dependencies in Kconfig. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/hwmon/via686a.c')
-rw-r--r--drivers/hwmon/via686a.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index 8eb9d084149d..e6fc43a8ba47 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -35,6 +35,7 @@
35#include <linux/pci.h> 35#include <linux/pci.h>
36#include <linux/jiffies.h> 36#include <linux/jiffies.h>
37#include <linux/i2c.h> 37#include <linux/i2c.h>
38#include <linux/i2c-isa.h>
38#include <linux/i2c-sensor.h> 39#include <linux/i2c-sensor.h>
39#include <linux/hwmon.h> 40#include <linux/hwmon.h>
40#include <linux/err.h> 41#include <linux/err.h>
@@ -846,7 +847,7 @@ static int __devinit via686a_pci_probe(struct pci_dev *dev,
846 normal_isa[0] = addr; 847 normal_isa[0] = addr;
847 848
848 s_bridge = pci_dev_get(dev); 849 s_bridge = pci_dev_get(dev);
849 if (i2c_add_driver(&via686a_driver)) { 850 if (i2c_isa_add_driver(&via686a_driver)) {
850 pci_dev_put(s_bridge); 851 pci_dev_put(s_bridge);
851 s_bridge = NULL; 852 s_bridge = NULL;
852 } 853 }
@@ -873,7 +874,7 @@ static void __exit sm_via686a_exit(void)
873{ 874{
874 pci_unregister_driver(&via686a_pci_driver); 875 pci_unregister_driver(&via686a_pci_driver);
875 if (s_bridge != NULL) { 876 if (s_bridge != NULL) {
876 i2c_del_driver(&via686a_driver); 877 i2c_isa_del_driver(&via686a_driver);
877 pci_dev_put(s_bridge); 878 pci_dev_put(s_bridge);
878 s_bridge = NULL; 879 s_bridge = NULL;
879 } 880 }