spi: imx: Use correct number of bytes per words (afb27208) · Commits · 戴 / test

The SPI core enforces that we always use the next power-of-two number of bytes to store words. As a result, a 24 bits word will be stored in 4 bytes. This commit fixes the spi_imx_bytes_per_word function to return the correct number of bytes. This also allows to get rid of unnecessary checks in the can_dma function, since the SPI core validates that we always have a transfer length that is a multiple of the number of bytes per word. Signed-off-by:

Maxime Chevallier <maxime.chevallier@bootlin.com> Signed-off-by:

Mark Brown <broonie@kernel.org>

drivers/spi/spi-imx.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -202,7 +202,12 @@ out:

		static int spi_imx_bytes_per_word(const int bits_per_word)
		{
		return DIV_ROUND_UP(bits_per_word, BITS_PER_BYTE);
		if (bits_per_word <= 8)
		return 1;
		else if (bits_per_word <= 16)
		return 2;
		else
		return 4;
		}

		static bool spi_imx_can_dma(struct spi_master master, struct spi_device spi,
		@@ -219,9 +224,6 @@ static bool spi_imx_can_dma(struct spi_master master, struct spi_device spi,

		bytes_per_word = spi_imx_bytes_per_word(transfer->bits_per_word);

		if (bytes_per_word != 1 && bytes_per_word != 2 && bytes_per_word != 4)
		return false;

		for (i = spi_imx->devtype_data->fifo_size / 2; i > 0; i--) {
		if (!(transfer->len % (i * bytes_per_word)))
		break;

Admin message