leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spi: simplify spi_sync() calling convention

Browse Source 
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: Marc Pignat <marc.pignat@hevs.ch>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Marc Pignat 2007-12-04 23:45:10 -08:00 committed by Linus Torvalds
parent 3f86f14c0f
commit 9b938b7490
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/spi/spi.c
View File

@ -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);