i2c-for-6.16-rc3
The following changes since commit 19272b37aa4f83ca52bdf9c16d5d81bdd1354494:
Linux 6.16-rc1 (2025-06-08 13:44:43 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git tags/i2c-for-6.16-rc3
for you to fetch changes up to a6c23dac756b9541b33aa3bcd30f464df2879209:
i2c: k1: check for transfer error (2025-06-21 22:17:02 +0200)
----------------------------------------------------------------
i2c-for-6.16-rc3
- subsystem: convert drivers to use recent callbacks of struct i2c_algorithm A typical after-rc1 cleanup, which I couldn't send in time for rc2
- tegra: fix YAML conversion of device tree bindings
- k1: re-add a check which got lost during upstreaming
----------------------------------------------------------------
Akhil R (1):
dt-bindings: i2c: nvidia,tegra20-i2c: Specify the required properties
Alex Elder (1):
i2c: k1: check for transfer error
Wolfram Sang (2):
i2c: use inclusive callbacks in struct i2c_algorithm
Merge tag 'i2c-host-fixes-6.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current
with much appreciated quality assurance from
----------------------------------------------------------------
Krzysztof Kozlowski (1):
(Rev.) dt-bindings: i2c: nvidia,tegra20-i2c: Specify the required properties
Troy Mitchell (1):
(Rev.) i2c: k1: check for transfer error
.../bindings/i2c/nvidia,tegra20-i2c.yaml | 24 +++++++++++++++++++++- drivers/i2c/algos/i2c-algo-bit.c | 4 ++-- drivers/i2c/algos/i2c-algo-pca.c | 4 ++-- drivers/i2c/algos/i2c-algo-pcf.c | 4 ++-- drivers/i2c/busses/i2c-amd-mp2-plat.c | 2 +- drivers/i2c/busses/i2c-aspeed.c | 8 ++++---- drivers/i2c/busses/i2c-at91-master.c | 4 ++-- drivers/i2c/busses/i2c-axxia.c | 2 +- drivers/i2c/busses/i2c-bcm-iproc.c | 2 +- drivers/i2c/busses/i2c-cadence.c | 10 ++++----- drivers/i2c/busses/i2c-cgbc.c | 4 ++-- drivers/i2c/busses/i2c-eg20t.c | 2 +- drivers/i2c/busses/i2c-emev2.c | 6 +++--- drivers/i2c/busses/i2c-exynos5.c | 6 +++--- drivers/i2c/busses/i2c-gxp.c | 6 +++--- drivers/i2c/busses/i2c-img-scb.c | 2 +- drivers/i2c/busses/i2c-imx-lpi2c.c | 8 ++++---- drivers/i2c/busses/i2c-imx.c | 8 ++++---- drivers/i2c/busses/i2c-k1.c | 2 +- drivers/i2c/busses/i2c-keba.c | 2 +- drivers/i2c/busses/i2c-mchp-pci1xxxx.c | 2 +- drivers/i2c/busses/i2c-meson.c | 4 ++-- drivers/i2c/busses/i2c-microchip-corei2c.c | 2 +- drivers/i2c/busses/i2c-mt65xx.c | 2 +- drivers/i2c/busses/i2c-mxs.c | 2 +- drivers/i2c/busses/i2c-nomadik.c | 4 ++-- drivers/i2c/busses/i2c-npcm7xx.c | 6 +++--- drivers/i2c/busses/i2c-omap.c | 6 +++--- drivers/i2c/busses/i2c-pnx.c | 2 +- drivers/i2c/busses/i2c-pxa.c | 16 +++++++-------- drivers/i2c/busses/i2c-qcom-cci.c | 4 ++-- drivers/i2c/busses/i2c-qcom-geni.c | 4 ++-- drivers/i2c/busses/i2c-qup.c | 8 ++++---- drivers/i2c/busses/i2c-rcar.c | 10 ++++----- drivers/i2c/busses/i2c-s3c2410.c | 6 +++--- drivers/i2c/busses/i2c-sh7760.c | 4 ++-- drivers/i2c/busses/i2c-sh_mobile.c | 4 ++-- drivers/i2c/busses/i2c-stm32f7.c | 4 ++-- drivers/i2c/busses/i2c-synquacer.c | 4 ++-- drivers/i2c/busses/i2c-tegra.c | 6 +++--- drivers/i2c/busses/i2c-xiic.c | 4 ++-- drivers/i2c/busses/i2c-xlp9xx.c | 2 +- drivers/i2c/i2c-atr.c | 2 +- drivers/i2c/i2c-mux.c | 6 +++--- drivers/i2c/muxes/i2c-demux-pinctrl.c | 4 ++-- 45 files changed, 125 insertions(+), 103 deletions(-)
Quoted 3 lines · Wolfram Sang
- subsystem: convert drivers to use recent callbacks of struct
i2c_algorithmA typical after-rc1 cleanup, which I couldn't send in time for rc2
Honestly, this is just *annoying*.
It's made extra annoying by the fact that you also did some random whitespace changes while at it, and almost half the lines modified are just completely irrelevant indentation changes.
Looking at the stats, your pull is:
45 files changed, 125 insertions(+), 103 deletions(-)
but ignoring the whitespace changes it drops to
45 files changed, 84 insertions(+), 62 deletions(-)
all of which just makes it really really hard to see that it's just a trivial conversion.
I've pulled this, but I was really close to just unpulling it because it was such a messy thing and badly done.
If you do conversions after the merge window, make them DAMN OBVIOUS. Make them minimal, make them automated, and DO NOT DO OTHER RANDOM CRAP AROUND THEM.
Linus
The pull request you sent on Sun, 22 Jun 2025 15:20:28 +0200:
The pull request you sent on Sun, 22 Jun 2025 15:20:28 +0200:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.gittags/i2c-for-6.16-rc3
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b67ec639010f7d2ce2b467cef36f3e5e785d8d50
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html
Linus,
Quoted 3 lines
If you do conversions after the merge window, make them DAMN OBVIOUS. Make them minimal, make them automated, and DO NOT DO OTHER RANDOM CRAP AROUND THEM.
Okay, I don't want to do annoying things, so let me rephrase what I got out of this. I should have 2 cleanup patches, one for the callback changes and one for the whitespace changes?
Because I think the whitespace patch is needed. This is still the beginning of a larger refactoring and having struct members initialized according to coding style will greatly simplify next steps. And this paragraph should then be the commit message of the whitespace patch.
I assumed that it was obvious that everything in this pull request was automated. I honestly really don't enjoy pushing whitespaces around manually.
Wolfram
Quoted 4 lines · Wolfram Sang
I assumed that it was obvious that everything in this pull request was automated. I honestly really don't enjoy pushing whitespaces around manually.
Actually, the reason I reacted was that it wasn't so very obvious.
I took a look at the commit just because it was larger than expected, and it didn't look very automated
If you take a look at that commit 614b1c3cbfb0 ("i2c: use inclusive callbacks in struct i2c_algorithm"), about half looks very straightforward and looks like a sed-script or something. So you have things like this:
- .master_xfer = bit_xfer, - .master_xfer_atomic = bit_xfer_atomic, + .xfer = bit_xfer, + .xfer_atomic = bit_xfer_atomic,
which looks like a very straightforward rename, and may well have been done with something like
sed -iE 's/\.master_xfer[[:space:]]*=[[:space:]]*/.xfer = /'
or something like that (same for the 'atomic' version, of course).
But almost half of the lines changed in that patch (ok, 40%) is to things that didn't actually change. and is just whitespace changes to unrelated lines that didn't change.
You do mention it in the commit message as "Fix alignment of '=' while here", but that really did make it much harder to see what was going on.
And no, this isn't a big deal, but it ended up annoying mainly because the line count in the pull request was bigger than I would have expected from the description, which then made me go look at what was going on...
Linus