From: Jean Delvare <khali@linux-fr.org>
Date: Tue, 19 Jul 2005 22:09:03 +0000 (+0200)
Subject: [PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (9/9)
X-Git-Tag: v2.6.14-rc1~752^2~46
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=570aefc361d3315ec6749f573009286106b0b2d8;p=linux-2.6-omap-h63xx.git

[PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (9/9)

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>
---

diff --git a/include/linux/i2c-isa.h b/include/linux/i2c-isa.h
index b5727d7702e..db793b68356 100644
--- a/include/linux/i2c-isa.h
+++ b/include/linux/i2c-isa.h
@@ -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 */
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 39ff363eade..da4faa016b1 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -580,11 +580,4 @@ union i2c_smbus_data {
 			.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 */