Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 060556a9 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Mark Brown
Browse files

spi: ti-qspi: cleanup wait_for_completion return handling 



return type of wait_for_completion_timeout is unsigned long not int, this
patch uses the return value of wait_for_completion_timeout in the condition
directly rather than assigning it to an incorrect type variable.

Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 97bf6af1

drivers/spi/spi-ti-qspi.c

+6 −8
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static void ti_qspi_restore_ctx(struct ti_qspi *qspi) 


static int qspi_write_msg(struct ti_qspi *qspi, struct spi_transfer *t)

{

	int wlen, count, ret;

	int wlen, count;

	unsigned int cmd;

	const u8 *txbuf;
@@ -230,9 +230,8 @@ static int qspi_write_msg(struct ti_qspi *qspi, struct spi_transfer *t) 
		}



		ti_qspi_write(qspi, cmd, QSPI_SPI_CMD_REG);

		ret = wait_for_completion_timeout(&qspi->transfer_complete,

						  QSPI_COMPLETION_TIMEOUT);

		if (ret == 0) {

		if (!wait_for_completion_timeout(&qspi->transfer_complete,

						 QSPI_COMPLETION_TIMEOUT)) {

			dev_err(qspi->dev, "write timed out\n");

			return -ETIMEDOUT;

		}
@@ -245,7 +244,7 @@ static int qspi_write_msg(struct ti_qspi *qspi, struct spi_transfer *t) 


static int qspi_read_msg(struct ti_qspi *qspi, struct spi_transfer *t)

{

	int wlen, count, ret;

	int wlen, count;

	unsigned int cmd;

	u8 *rxbuf;
@@ -268,9 +267,8 @@ static int qspi_read_msg(struct ti_qspi *qspi, struct spi_transfer *t) 
	while (count) {

		dev_dbg(qspi->dev, "rx cmd %08x dc %08x\n", cmd, qspi->dc);

		ti_qspi_write(qspi, cmd, QSPI_SPI_CMD_REG);

		ret = wait_for_completion_timeout(&qspi->transfer_complete,

				QSPI_COMPLETION_TIMEOUT);

		if (ret == 0) {

		if (!wait_for_completion_timeout(&qspi->transfer_complete,

						 QSPI_COMPLETION_TIMEOUT)) {

			dev_err(qspi->dev, "read timed out\n");

			return -ETIMEDOUT;

		}