forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[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 <[email protected]>
- Loading branch information
Showing
10 changed files
with
97 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,6 +31,7 @@ | |
#include <linux/ioport.h> | ||
#include <linux/jiffies.h> | ||
#include <linux/i2c.h> | ||
#include <linux/i2c-isa.h> | ||
#include <linux/i2c-sensor.h> | ||
#include <linux/hwmon.h> | ||
#include <linux/err.h> | ||
|
@@ -350,12 +351,12 @@ static int __init smsc47b397_init(void) | |
if ((ret = smsc47b397_find(normal_isa))) | ||
return ret; | ||
|
||
return i2c_add_driver(&smsc47b397_driver); | ||
return i2c_isa_add_driver(&smsc47b397_driver); | ||
} | ||
|
||
static void __exit smsc47b397_exit(void) | ||
{ | ||
i2c_del_driver(&smsc47b397_driver); | ||
i2c_isa_del_driver(&smsc47b397_driver); | ||
} | ||
|
||
MODULE_AUTHOR("Mark M. Hoffman <[email protected]>"); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,6 +30,7 @@ | |
#include <linux/ioport.h> | ||
#include <linux/jiffies.h> | ||
#include <linux/i2c.h> | ||
#include <linux/i2c-isa.h> | ||
#include <linux/i2c-sensor.h> | ||
#include <linux/hwmon.h> | ||
#include <linux/err.h> | ||
|
@@ -592,12 +593,12 @@ static int __init sm_smsc47m1_init(void) | |
return -ENODEV; | ||
} | ||
|
||
return i2c_add_driver(&smsc47m1_driver); | ||
return i2c_isa_add_driver(&smsc47m1_driver); | ||
} | ||
|
||
static void __exit sm_smsc47m1_exit(void) | ||
{ | ||
i2c_del_driver(&smsc47m1_driver); | ||
i2c_isa_del_driver(&smsc47m1_driver); | ||
} | ||
|
||
MODULE_AUTHOR("Mark D. Studebaker <[email protected]>"); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,6 +40,7 @@ | |
#include <linux/init.h> | ||
#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> | ||
|
@@ -847,12 +848,12 @@ static int __init sensors_w83627ehf_init(void) | |
&& w83627ehf_find(0x4e, &normal_isa[0])) | ||
return -ENODEV; | ||
|
||
return i2c_add_driver(&w83627ehf_driver); | ||
return i2c_isa_add_driver(&w83627ehf_driver); | ||
} | ||
|
||
static void __exit sensors_w83627ehf_exit(void) | ||
{ | ||
i2c_del_driver(&w83627ehf_driver); | ||
i2c_isa_del_driver(&w83627ehf_driver); | ||
} | ||
|
||
MODULE_AUTHOR("Jean Delvare <[email protected]>"); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,6 +42,7 @@ | |
#include <linux/slab.h> | ||
#include <linux/jiffies.h> | ||
#include <linux/i2c.h> | ||
#include <linux/i2c-isa.h> | ||
#include <linux/i2c-sensor.h> | ||
#include <linux/i2c-vid.h> | ||
#include <linux/hwmon.h> | ||
|
@@ -1507,12 +1508,12 @@ static int __init sensors_w83627hf_init(void) | |
} | ||
normal_isa[0] = addr; | ||
|
||
return i2c_add_driver(&w83627hf_driver); | ||
return i2c_isa_add_driver(&w83627hf_driver); | ||
} | ||
|
||
static void __exit sensors_w83627hf_exit(void) | ||
{ | ||
i2c_del_driver(&w83627hf_driver); | ||
i2c_isa_del_driver(&w83627hf_driver); | ||
} | ||
|
||
MODULE_AUTHOR("Frodo Looijaard <[email protected]>, " | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters