spi: dw: Fix duplicate if block in dw_spi_transfer_one#7465
Merged
pelwell merged 1 commit intoJun 30, 2026
Conversation
popcornmix
reviewed
Jun 30, 2026
| cfg.tmode = DW_SPI_CTRLR0_TMOD_TO; | ||
| } | ||
| if (!dws->tx) { | ||
| } else if (!dws->tx) { |
Collaborator
There was a problem hiding this comment.
I think the added else here changes behaviour. Was that intended?
Contributor
Author
There was a problem hiding this comment.
Yes, as Phil stated, I think these are mutually exclusive events
pelwell
reviewed
Jun 30, 2026
| cfg.tmode = DW_SPI_CTRLR0_TMOD_TO; | ||
| } | ||
| if (!dws->tx) { | ||
| } else if (!dws->tx) { |
Contributor
There was a problem hiding this comment.
The switch to using an else is actually a change in behaviour - previously it was possible to enter the bodies of both if statements (if neither tx nor rx were set), but that's probably not possible (and certainly not useful) in reality. This way probably makes more sense.
martamomotko
force-pushed
the
fix-duplicate-if-block
branch
from
8ad364d to
3c1e69b
Compare
The transmit only and receive only conditions in dw_spi_transfer_one() are mutually exclusive, so restructure as if/else if and remove the duplicate check. Signed-off-by: Marta Momotko <marta.momotko@raspberrypi.com>
martamomotko
force-pushed
the
fix-duplicate-if-block
branch
from
3c1e69b to
aa9cfc8
Compare
popcornmix
approved these changes
Jun 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.