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

[linux-2.6] / include / linux / i2c.h

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index ebcd745f4cd6f730702b5f00821d5d6448ce12e6..3be06105034c72482f42a0a8bba3091bef597638 100644 (file)
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -34,6 +34,13 @@
 #include <linux/device.h>      /* for struct device */
 #include <asm/semaphore.h>
 
+/* --- For i2c-isa ---------------------------------------------------- */
+
+extern void i2c_adapter_dev_release(struct device *dev);
+extern struct device_driver i2c_adapter_driver;
+extern struct class i2c_adapter_class;
+extern struct bus_type i2c_bus_type;
+
 /* --- General options ------------------------------------------------        */
 
 struct i2c_msg;
@@ -160,6 +167,11 @@ struct i2c_client {
 };
 #define to_i2c_client(d) container_of(d, struct i2c_client, dev)
 
+static inline struct i2c_client *kobj_to_i2c_client(struct kobject *kobj)
+{
+       return to_i2c_client(container_of(kobj, struct device, kobj));
+}
+
 static inline void *i2c_get_clientdata (struct i2c_client *dev)
 {
        return dev_get_drvdata (&dev->dev);
@@ -290,11 +302,8 @@ static inline void i2c_set_adapdata (struct i2c_adapter *dev, void *data)
  */
 struct i2c_client_address_data {
        unsigned short *normal_i2c;
-       unsigned short *normal_i2c_range;
        unsigned short *probe;
-       unsigned short *probe_range;
        unsigned short *ignore;
-       unsigned short *ignore_range;
        unsigned short *force;
 };
 
@@ -563,24 +572,15 @@ union i2c_smbus_data {
 #define I2C_CLIENT_INSMOD \
   I2C_CLIENT_MODULE_PARM(probe, \
                       "List of adapter,address pairs to scan additionally"); \
-  I2C_CLIENT_MODULE_PARM(probe_range, \
-                      "List of adapter,start-addr,end-addr triples to scan " \
-                      "additionally"); \
   I2C_CLIENT_MODULE_PARM(ignore, \
                       "List of adapter,address pairs not to scan"); \
-  I2C_CLIENT_MODULE_PARM(ignore_range, \
-                      "List of adapter,start-addr,end-addr triples not to " \
-                      "scan"); \
   I2C_CLIENT_MODULE_PARM(force, \
                       "List of adapter,address pairs to boldly assume " \
                       "to be present"); \
        static struct i2c_client_address_data addr_data = {             \
                        .normal_i2c =           normal_i2c,             \
-                       .normal_i2c_range =     normal_i2c_range,       \
                        .probe =                probe,                  \
-                       .probe_range =          probe_range,            \
                        .ignore =               ignore,                 \
-                       .ignore_range =         ignore_range,           \
                        .force =                force,                  \
                }