| Message ID | 20220908130518.32186-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 86432b7f8f92b784c2e4af5b02766fb44052abf7 |
| Headers | show |
| Series | [v2,1/1] spi: Group cs_change and cs_off flags together in struct spi_transfer | expand |
On Thu, 8 Sep 2022 16:05:18 +0300, Andy Shevchenko wrote: > The commit 5e0531f6b90a ("spi: Add capability to perform some transfer > with chipselect off") added a new flag but squeezed it into a wrong > group of struct spi_transfer members (note that SPI_NBITS_* are macros > for easier interpretation of the tx_nbits and rx_nbits bitfields). > > Group cs_change and cs_off flags together and their doc strings. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: Group cs_change and cs_off flags together in struct spi_transfer commit: 86432b7f8f92b784c2e4af5b02766fb44052abf7 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index e111cf5e77de..6ea889df0813 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -848,8 +848,8 @@ struct spi_res { * @bits_per_word: select a bits_per_word other than the device default * for this transfer. If 0 the default (from @spi_device) is used. * @dummy_data: indicates transfer is dummy bytes transfer. - * @cs_change: affects chipselect after this transfer completes * @cs_off: performs the transfer with chipselect off. + * @cs_change: affects chipselect after this transfer completes * @cs_change_delay: delay between cs deassert and assert when * @cs_change is set and @spi_transfer is not the last in @spi_message * @delay: delay to be introduced after this transfer before @@ -959,10 +959,10 @@ struct spi_transfer { struct sg_table rx_sg; unsigned dummy_data:1; + unsigned cs_off:1; unsigned cs_change:1; unsigned tx_nbits:3; unsigned rx_nbits:3; - unsigned cs_off:1; #define SPI_NBITS_SINGLE 0x01 /* 1bit transfer */ #define SPI_NBITS_DUAL 0x02 /* 2bits transfer */ #define SPI_NBITS_QUAD 0x04 /* 4bits transfer */
The commit 5e0531f6b90a ("spi: Add capability to perform some transfer with chipselect off") added a new flag but squeezed it into a wrong group of struct spi_transfer members (note that SPI_NBITS_* are macros for easier interpretation of the tx_nbits and rx_nbits bitfields). Group cs_change and cs_off flags together and their doc strings. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- v2: fixed some grammar issues, grouped doc strings as well include/linux/spi/spi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)