On Thu, 27 May 2021 22:23:34 +0200
Wolfram Sang <wsa@xxxxxxxxxx> wrote:
> Hi Jonathan,
>
> > Fixes: 68068fad0e1c ("iio: accel: fxls8962af: fix errata bug E3 - I2C burst reads")
> > Cc: Sean Nyekjaer <sean@xxxxxxxxxx>
> > Cc: Wolfram Sang <wsa@xxxxxxxxxx>
> > ---
> >
> > Note the broken patch is only in the IIO/togreg branch at the moment.
>
> Then the fixes tag should be removed. It is only for upstream commits.
Ok, so that is there because my assumption was that mostly like I'd take
this patch through IIO, in which case it's directly valid and necessary
for backport information purposes. I'm guessing this one is unlikely to
cause merge conflicts given how localized it is...
You would do an immutable branch that I can pull into IIO. I'd really like
to avoid rebasing the IIO tree unless absolutely necessary as people are
working on top if it.
> It means we will have a merge dependency the next cycle, so I will send
> my pull request early.
Doesn't work. There is a high chance the original patch will get ported
back to earlier kernels and there is no reference to let anyone know they
also need this one to avoid potential build issues on the stable kernel.
So, if you want to take this through I2C, the path forwards would be.
1) You take this one through I2C
2) I apply the original fix (which #ifdefs the relevant code out in the
driver).
3) Once (1) is in mainline next cycle, I can revert (2) on the basis
it is no longer necessary.
I'm fine with doing it this way as it avoids any cross dependencies.
>
> >
> > include/linux/i2c.h | 7 +++++++
> > 1 file changed, 7 insertions(+)
> >
> > diff --git a/include/linux/i2c.h b/include/linux/i2c.h
> > index e8f2ac8c9c3d..aa52738b9c46 100644
> > --- a/include/linux/i2c.h
> > +++ b/include/linux/i2c.h
> > @@ -343,7 +343,14 @@ struct i2c_client {
> > };
> > #define to_i2c_client(d) container_of(d, struct i2c_client, dev)
> >
> > +#if IS_ENABLED(CONFIG_I2C)
>
> Hmm, can't we move this into an already existing IS_ENABLED block?
There aren't any similar #if / #else blocks for CONFIG_I2C in i2c.h
so it seemed neater to just add one around this individual element
and not destroy the general organization of the file.
Jonathan
>
>
