[PATCH] i2c: Delete 2 out-of-date, colliding ioctl defines
Linux Kernel Mailing List <[email protected]> Fri, 2 Jun 2006 18:59:51 GMT
| Newsgroups | gmane.linux.kernel.commits.2-4 |
|---|---|
| Message-ID | <[email protected]> |
commit 21a413610d9ce4294e57b48b99f4f4ca8803688a tree d7fc4cf8f3fbbdbab193e316e82082e48deb4ce7 parent 252a7a8238d91aa4067934798c33d2aa63f84fd8 author Jean Delvare <[email protected]> Wed, 31 May 2006 18:28:48 +0200 committer Marcelo Tosatti <[email protected]> Fri, 02 Jun 2006 21:29:34 -0300 [PATCH] i2c: Delete 2 out-of-date, colliding ioctl defines Delete 2 out-of-date, colliding ioctl defines I2C_UDELAY and I2C_MDELAY are supposed to be used by i2c-algo-bit, but actually aren't (and I suspect never were). That wouldn't be a major issue, but it happens that their values are the same as I2C_FUNCS and I2C_SLAVE_FORCE, respectively, which *are* widely used. It might cause unnecessary confusion, thus I think it's better to get rid of them, as was already done in Linux 2.6 and i2c-CVS 7 months ago. http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=80ce3b7d0f52877b80cddc3ace8b332d888f0131 Signed-off-by: Jean Delvare <[email protected]> include/linux/i2c.h | 5 ----- 1 files changed, 5 deletions(-) diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 1e1bfa2..87a6dd0 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -464,11 +464,6 @@ #endif #define I2C_SMBUS 0x0720 /* SMBus-level access */ -/* ... algo-bit.c recognizes */ -#define I2C_UDELAY 0x0705 /* set delay in microsecs between each */ - /* written byte (except address) */ -#define I2C_MDELAY 0x0706 /* millisec delay between written bytes */ - /* ----- I2C-DEV: char device interface stuff ------------------------- */ #define I2C_MAJOR 89 /* Device major number */