From khali@linux-fr.org Tue Jul 19 18:12:04 2005 Date: Wed, 20 Jul 2005 00:09:03 +0200 From: Jean Delvare <khali@linux-fr.org> To: LKML <linux-kernel@vger.kernel.org>, LM Sensors <lm-sensors@lm-sensors.org> Cc: Greg KH <greg@kroah.com> Subject: I2C: Separate non-i2c hwmon drivers from i2c-core (9/9) Message-Id: <20050720000903.2f2cf8e3.khali@linux-fr.org> Move the definitions of i2c_is_isa_client and i2c_is_isa_adapter from i2c.h to i2c-isa.h. Only hybrid drivers still need them. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- include/linux/i2c-isa.h | 7 +++++++ include/linux/i2c.h | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) --- gregkh-2.6.orig/include/linux/i2c-isa.h 2005-07-27 23:17:42.000000000 -0700 +++ gregkh-2.6/include/linux/i2c-isa.h 2005-07-27 23:17:52.000000000 -0700 @@ -26,4 +26,11 @@ extern int i2c_isa_add_driver(struct i2c_driver *driver); extern int i2c_isa_del_driver(struct i2c_driver *driver); +/* Detect whether we are on the isa bus. This is only useful to hybrid + (i2c+isa) drivers. */ +#define i2c_is_isa_client(clientptr) \ + ((clientptr)->adapter->algo->id == I2C_ALGO_ISA) +#define i2c_is_isa_adapter(adapptr) \ + ((adapptr)->algo->id == I2C_ALGO_ISA) + #endif /* _LINUX_I2C_ISA_H */ --- gregkh-2.6.orig/include/linux/i2c.h 2005-07-27 23:17:46.000000000 -0700 +++ gregkh-2.6/include/linux/i2c.h 2005-07-27 23:17:52.000000000 -0700 @@ -580,11 +580,4 @@ .force = force, \ } -/* Detect whether we are on the isa bus. If this returns true, all i2c - access will fail! */ -#define i2c_is_isa_client(clientptr) \ - ((clientptr)->adapter->algo->id == I2C_ALGO_ISA) -#define i2c_is_isa_adapter(adapptr) \ - ((adapptr)->algo->id == I2C_ALGO_ISA) - #endif /* _LINUX_I2C_H */