Unverified Commit 99aebb3c authored by Christophe Leroy's avatar Christophe Leroy Committed by Mark Brown
Browse files

spi: fsl-spi: Change mspi_apply_cpu_mode_quirks() to void 



mspi_apply_cpu_mode_quirks() always returns the passed bits_per_word
unmodified.

Make it return void, then don't check bits_per_word anymore on
return as it doesn't change.

bits_per_word is already checked by __spi_validate() so no risk to
have bits_per_word higher than 32.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Link: https://lore.kernel.org/r/3142a7c40af12a160f4e134764f2c34da3d8e1e2.1680371809.git.christophe.leroy@csgroup.eu


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fc96ec82

drivers/spi/spi-fsl-spi.c

+6 −14
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static void fsl_spi_grlib_set_shifts(u32 *rx_shift, u32 *tx_shift, 
	}

}



static int mspi_apply_cpu_mode_quirks(struct spi_mpc8xxx_cs *cs,

static void mspi_apply_cpu_mode_quirks(struct spi_mpc8xxx_cs *cs,

				       struct spi_device *spi,

				       struct mpc8xxx_spi *mpc8xxx_spi,

				       int bits_per_word)
@@ -161,8 +161,7 @@ static int mspi_apply_cpu_mode_quirks(struct spi_mpc8xxx_cs *cs, 
	} else if (bits_per_word <= 32) {

		cs->get_rx = mpc8xxx_spi_rx_buf_u32;

		cs->get_tx = mpc8xxx_spi_tx_buf_u32;

	} else

		return -EINVAL;

	}



	if (mpc8xxx_spi->set_shifts)

		mpc8xxx_spi->set_shifts(&cs->rx_shift, &cs->tx_shift,
@@ -173,8 +172,6 @@ static int mspi_apply_cpu_mode_quirks(struct spi_mpc8xxx_cs *cs, 
	mpc8xxx_spi->tx_shift = cs->tx_shift;

	mpc8xxx_spi->get_rx = cs->get_rx;

	mpc8xxx_spi->get_tx = cs->get_tx;



	return bits_per_word;

}



static int fsl_spi_setup_transfer(struct spi_device *spi,
@@ -201,12 +198,7 @@ static int fsl_spi_setup_transfer(struct spi_device *spi, 
		hz = spi->max_speed_hz;



	if (!(mpc8xxx_spi->flags & SPI_CPM_MODE))

		bits_per_word = mspi_apply_cpu_mode_quirks(cs, spi,

							   mpc8xxx_spi,

							   bits_per_word);



	if (bits_per_word < 0)

		return bits_per_word;

		mspi_apply_cpu_mode_quirks(cs, spi, mpc8xxx_spi, bits_per_word);



	if (bits_per_word == 32)

		bits_per_word = 0;