[PATCH i2c-tools] i2c-dev.h: copy over typo fix from kernel include

[PATCH i2c-tools] i2c-dev.h: copy over typo fix from kernel include

[Wolfram Sang]

We had a typo in a define which got fixed in the kernel. Fix it here,
too!

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
 include/linux/i2c-dev.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/linux/i2c-dev.h b/include/linux/i2c-dev.h
index 839d25a..bbb50e8 100644
--- a/include/linux/i2c-dev.h
+++ b/include/linux/i2c-dev.h
@@ -66,7 +66,9 @@ struct i2c_rdwr_ioctl_data {
 	__u32 nmsgs;			/* number of i2c_msgs */
 };
 
-#define  I2C_RDRW_IOCTL_MAX_MSGS	42
+#define  I2C_RDWR_IOCTL_MAX_MSGS	42
+/* Originally defined with a typo, keep it for compatibility */
+#define  I2C_RDRW_IOCTL_MAX_MSGS	I2C_RDWR_IOCTL_MAX_MSGS
 
 
 #endif /* _LINUX_I2C_DEV_H */
-- 
2.11.0

Re: [PATCH i2c-tools] i2c-dev.h: copy over typo fix from kernel include

[Jean Delvare]

Hi Wolfram,

On Mon, 15 Jan 2018 21:40:30 +0100, Wolfram Sang wrote:
> We had a typo in a define which got fixed in the kernel. Fix it here,
> too!
> 
> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
> ---
>  include/linux/i2c-dev.h | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/include/linux/i2c-dev.h b/include/linux/i2c-dev.h
> index 839d25a..bbb50e8 100644
> --- a/include/linux/i2c-dev.h
> +++ b/include/linux/i2c-dev.h
> @@ -66,7 +66,9 @@ struct i2c_rdwr_ioctl_data {
>  	__u32 nmsgs;			/* number of i2c_msgs */
>  };
>  
> -#define  I2C_RDRW_IOCTL_MAX_MSGS	42
> +#define  I2C_RDWR_IOCTL_MAX_MSGS	42
> +/* Originally defined with a typo, keep it for compatibility */
> +#define  I2C_RDRW_IOCTL_MAX_MSGS	I2C_RDWR_IOCTL_MAX_MSGS
>  
>  
>  #endif /* _LINUX_I2C_DEV_H */

Hmm, no. As part of the libi2c plan, we were supposed to get rid of
kernel header files duplication in i2c-tools. See commits 93caf007f4cb
("i2c-dev: Move SMBus helper functions to include/i2c/smbus.h") and
652619121974 ("i2c-dev.h: Minimize differences with kernel flavor".) At
this point i2c-tools' i2c-dev.h and the kernel's i2c-dev.h are exactly
the same file, modulo the difference you just pointed out.

So the right thing to do is to delete include/linux/i2c-dev.h from
i2c-tools altogether. We no longer use it and we no longer install it,
so it should be a straightforward change. I simply forgot to do it
after the library conversion.

Thanks,
-- 
Jean Delvare
SUSE L3 Support

Re: [PATCH i2c-tools] i2c-dev.h: copy over typo fix from kernel include

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 636 bytes --]


> 652619121974 ("i2c-dev.h: Minimize differences with kernel flavor".) At
> this point i2c-tools' i2c-dev.h and the kernel's i2c-dev.h are exactly
> the same file, modulo the difference you just pointed out.

Exactly. I wanted to follow up in minimizing the differences. But I was
unaware of the master plan...

> So the right thing to do is to delete include/linux/i2c-dev.h from
> i2c-tools altogether. We no longer use it and we no longer install it,
> so it should be a straightforward change. I simply forgot to do it
> after the library conversion.

... which I super like very much!

Acked-by: Wolfram Sang <wsa@the-dreams.de>


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH i2c-tools] i2c-dev.h: copy over typo fix from kernel include

[Jean Delvare]

On Fri, 19 Jan 2018 10:21:58 +0100, Wolfram Sang wrote:
> > 652619121974 ("i2c-dev.h: Minimize differences with kernel flavor".) At
> > this point i2c-tools' i2c-dev.h and the kernel's i2c-dev.h are exactly
> > the same file, modulo the difference you just pointed out.  
> 
> Exactly. I wanted to follow up in minimizing the differences. But I was
> unaware of the master plan...
> 
> > So the right thing to do is to delete include/linux/i2c-dev.h from
> > i2c-tools altogether. We no longer use it and we no longer install it,
> > so it should be a straightforward change. I simply forgot to do it
> > after the library conversion.  
> 
> ... which I super like very much!
> 
> Acked-by: Wolfram Sang <wsa@the-dreams.de>

Thanks, done.

https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/commit/?id=226bc03acca44cf4b300597308064c44676b6f4b

-- 
Jean Delvare
SUSE L3 Support