Unverified Commit 8d37f271 authored by Linus Walleij's avatar Linus Walleij Committed by Mark Brown
Browse files

spi: mpc512x-psc: Fix compile errors 



My patch created compilation bugs in the MPC512x-PSC driver.
Fix them up.

Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: linuxppc-dev@lists.ozlabs.org
Reported-by: default avatarkernel test robot <lkp@intel.com>
Fixes: 2818824c (" spi: mpc512x-psc: Convert to use GPIO descriptors")
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20220201234535.569973-1-linus.walleij@linaro.org


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

drivers/spi/spi-mpc512x-psc.c

+1 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static void mpc512x_psc_spi_activate_cs(struct spi_device *spi) 
	out_be32(psc_addr(mps, ccr), ccr);

	mps->bits_per_word = cs->bits_per_word;



	if (cs->gpiod) {

	if (spi->cs_gpiod) {

		if (mps->cs_control)

			/* boardfile override */

			mps->cs_control(spi, (spi->mode & SPI_CS_HIGH) ? 1 : 0);
@@ -373,7 +373,6 @@ static int mpc512x_psc_spi_unprep_xfer_hw(struct spi_master *master) 
static int mpc512x_psc_spi_setup(struct spi_device *spi)

{

	struct mpc512x_psc_spi_cs *cs = spi->controller_state;

	int ret;



	if (spi->bits_per_word % 8)

		return -EINVAL;