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

Commit 9b938b74 authored by Marc Pignat's avatar Marc Pignat Committed by Linus Torvalds
Browse files

spi: simplify spi_sync() calling convention 



Simplify spi_sync calling convention, eliminating the need to check both
the return value AND the message->status.  In consequence, this corrects
misbehaviours of spi_read and spi_write (which only checked the former) and
their callers.

Signed-off-by: default avatarMarc Pignat <marc.pignat@hevs.ch>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3f86f14c

drivers/spi/spi.c

+5 −8
Original line number Original line Diff line number Diff line
@@ -541,10 +541,7 @@ static void spi_complete(void *arg) 
 * Also, the caller is guaranteeing that the memory associated with the

 * Also, the caller is guaranteeing that the memory associated with the

 * message will not be freed before this call returns.

 * message will not be freed before this call returns.

 *

 *

 * The return value is a negative error code if the message could not be

 * It returns zero on success, else a negative error code.

 * submitted, else zero.  When the value is zero, then message->status is

 * also defined;  it's the completion code for the transfer, either zero

 * or a negative error code from the controller driver.

 */

 */

int spi_sync(struct spi_device *spi, struct spi_message *message)

int spi_sync(struct spi_device *spi, struct spi_message *message)

{

{
@@ -554,8 +551,10 @@ int spi_sync(struct spi_device *spi, struct spi_message *message) 
	message->complete = spi_complete;

	message->complete = spi_complete;

	message->context = &done;

	message->context = &done;

	status = spi_async(spi, message);

	status = spi_async(spi, message);

	if (status == 0)

	if (status == 0) {

		wait_for_completion(&done);

		wait_for_completion(&done);

		status = message->status;

	}

	message->context = NULL;

	message->context = NULL;

	return status;

	return status;

}

}
@@ -628,10 +627,8 @@ int spi_write_then_read(struct spi_device *spi, 




	/* do the i/o */

	/* do the i/o */

	status = spi_sync(spi, &message);

	status = spi_sync(spi, &message);

	if (status == 0) {

	if (status == 0)

		memcpy(rxbuf, x[1].rx_buf, n_rx);

		memcpy(rxbuf, x[1].rx_buf, n_rx);

		status = message.status;

	}





	if (x[0].tx_buf == buf)

	if (x[0].tx_buf == buf)

		mutex_unlock(&lock);

		mutex_unlock(&lock);