[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 b5727d7702e1c3b6d237ce3180890b772ae951e1..db793b68356c7d814ef1d5a4ea3e6809bc5c05b2 100644 (file)
--- 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 39ff363eadec2d245f97e1c3710091ee019fa98d..da4faa016b171470ba4bff943903b6a67b0cace0 100644 (file)
--- 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 */