| Message ID | 20230220140830.74180-1-wsa+renesas@sang-engineering.com |
|---|---|
| State | New |
| Headers | show |
| Series | [i2c-tools] i2cdetect: only use "newer" I2C_FUNC_* flags if they exist | expand |
On Mon, 20 Feb 2023 15:08:29 +0100, Wolfram Sang wrote: > This allows i2cdetect to be compiled for older kernels. > > Reported-by: "Poeche, Uwe" <uwe.poeche@siemens.com> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > --- > > Jean, do you mind these #ifdefs in the code? > > tools/i2cdetect.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/tools/i2cdetect.c b/tools/i2cdetect.c > index 5ab4ea4..2d4d3b4 100644 > --- a/tools/i2cdetect.c > +++ b/tools/i2cdetect.c > @@ -160,12 +160,16 @@ static const struct func all_func[] = { > .name = "I2C Block Write" }, > { .value = I2C_FUNC_SMBUS_READ_I2C_BLOCK, > .name = "I2C Block Read" }, > +#if defined(I2C_FUNC_SMBUS_HOST_NOTIFY) > { .value = I2C_FUNC_SMBUS_HOST_NOTIFY, > .name = "SMBus Host Notify" }, > +#endif > { .value = I2C_FUNC_10BIT_ADDR, > .name = "10-bit addressing" }, > +#if defined(I2C_FUNC_SLAVE) > { .value = I2C_FUNC_SLAVE, > .name = "Target mode" }, > +#endif > { .value = 0, .name = "" } > }; > No objection. Reviewed-by: Jean Delvare <jdelvare@suse.de>
On Mon, Feb 20, 2023 at 03:08:29PM +0100, Wolfram Sang wrote: > This allows i2cdetect to be compiled for older kernels. > > Reported-by: "Poeche, Uwe" <uwe.poeche@siemens.com> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> And applied to master! Thank you, everyone.
diff --git a/tools/i2cdetect.c b/tools/i2cdetect.c index 5ab4ea4..2d4d3b4 100644 --- a/tools/i2cdetect.c +++ b/tools/i2cdetect.c @@ -160,12 +160,16 @@ static const struct func all_func[] = { .name = "I2C Block Write" }, { .value = I2C_FUNC_SMBUS_READ_I2C_BLOCK, .name = "I2C Block Read" }, +#if defined(I2C_FUNC_SMBUS_HOST_NOTIFY) { .value = I2C_FUNC_SMBUS_HOST_NOTIFY, .name = "SMBus Host Notify" }, +#endif { .value = I2C_FUNC_10BIT_ADDR, .name = "10-bit addressing" }, +#if defined(I2C_FUNC_SLAVE) { .value = I2C_FUNC_SLAVE, .name = "Target mode" }, +#endif { .value = 0, .name = "" } };
This allows i2cdetect to be compiled for older kernels. Reported-by: "Poeche, Uwe" <uwe.poeche@siemens.com> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- Jean, do you mind these #ifdefs in the code? tools/i2cdetect.c | 4 ++++ 1 file changed, 4 insertions(+)