i2c: Move i2c-dev interfaces to i2c-dev.h

Move the i2c-dev support into <linux/i2c-dev.h> where it should always
have lived.  Now <linux/i2c.h> no longer holds stuff related to the
optional userspace /dev/i2c-X interface.  Improve the descriptions
for these ioctl requests.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

2 files changed, 29 insertions, 32 deletions

diff --git a/include/linux/i2c-dev.h b/include/linux/i2c-dev.h
index 81c229a0fbca..311315b56b61 100644
--- a/include/linux/i2c-dev.h
+++ b/include/linux/i2c-dev.h
@@ -25,8 +25,31 @@
 #include <linux/types.h>
 #include <linux/compiler.h>
 
-/* Some IOCTL commands are defined in <linux/i2c.h> */
-/* Note: 10-bit addresses are NOT supported! */
+/* /dev/i2c-X ioctl commands.  The ioctl's parameter is always an
+ * unsigned long, except for:
+ *      - I2C_FUNCS, takes pointer to an unsigned long
+ *      - I2C_RDWR, takes pointer to struct i2c_rdwr_ioctl_data
+ *      - I2C_SMBUS, takes pointer to struct i2c_smbus_ioctl_data
+ */
+#define I2C_RETRIES     0x0701  /* number of times a device address should
+                                   be polled when not acknowledging */
+#define I2C_TIMEOUT     0x0702  /* set timeout in jiffies - call with int */
+
+/* NOTE: Slave address is 7 or 10 bits, but 10-bit addresses
+ * are NOT supported! (due to code brokenness)
+ */
+#define I2C_SLAVE       0x0703  /* Use this slave address */
+#define I2C_SLAVE_FORCE 0x0706  /* Use this slave address, even if it
+                                   is already in use by a driver! */
+#define I2C_TENBIT      0x0704  /* 0 for 7 bit addrs, != 0 for 10 bit */
+
+#define I2C_FUNCS       0x0705  /* Get the adapter functionality mask */
+
+#define I2C_RDWR        0x0707  /* Combined R/W transfer (one STOP only) */
+
+#define I2C_PEC         0x0708  /* != 0 to use PEC with SMBus */
+#define I2C_SMBUS       0x0720  /* SMBus transfer */
+
 
 /* This is the structure as used in the I2C_SMBUS ioctl call */
 struct i2c_smbus_ioctl_data {
@@ -44,4 +67,8 @@ struct i2c_rdwr_ioctl_data {
 
 #define  I2C_RDRW_IOCTL_MAX_MSGS        42
 
+#ifdef __KERNEL__
+#define I2C_MAJOR       89              /* Device major number          */
+#endif
+
 #endif /* _LINUX_I2C_DEV_H */
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index ae477b3106a2..e43d99d7551f 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -557,38 +557,8 @@ union i2c_smbus_data {
 #define I2C_SMBUS_I2C_BLOCK_DATA    8
 
 
-/* ----- commands for the ioctl like i2c_command call:
- * note that additional calls are defined in the algorithm and hw
- *      dependent layers - these can be listed here, or see the
- *      corresponding header files.
- */
-                                /* -> bit-adapter specific ioctls       */
-#define I2C_RETRIES     0x0701  /* number of times a device address      */
-                                /* should be polled when not            */
-                                /* acknowledging                        */
-#define I2C_TIMEOUT     0x0702  /* set timeout - call with int          */
-
-
-/* this is for i2c-dev.c        */
-#define I2C_SLAVE       0x0703  /* Change slave address                 */
-                                /* Attn.: Slave address is 7 or 10 bits */
-#define I2C_SLAVE_FORCE 0x0706  /* Change slave address                 */
-                                /* Attn.: Slave address is 7 or 10 bits */
-                                /* This changes the address, even if it */
-                                /* is already taken!                    */
-#define I2C_TENBIT      0x0704  /* 0 for 7 bit addrs, != 0 for 10 bit   */
-
-#define I2C_FUNCS       0x0705  /* Get the adapter functionality */
-#define I2C_RDWR        0x0707  /* Combined R/W transfer (one stop only)*/
-#define I2C_PEC         0x0708  /* != 0 for SMBus PEC                   */
-
-#define I2C_SMBUS       0x0720  /* SMBus-level access */
-
-/* ----- I2C-DEV: char device interface stuff ------------------------- */
 #ifdef __KERNEL__
 
-#define I2C_MAJOR       89              /* Device major number          */
-
 /* These defines are used for probing i2c client addresses */
 /* The length of the option lists */
 #define I2C_CLIENT_MAX_OPTS 48