From: Marc Pignat Subject: [RFC][PATCH 1/2 v2] spi: fix spi_sync Date: Fri, 26 Oct 2007 11:56:27 +0200 Message-ID: <200710261156.27892.marc.pignat@hevs.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: David Brownell To: spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: spi-devel-general-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: spi-devel-general-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: linux-spi.vger.kernel.org Ease spi_sync calling convention. There is no more need to check the return value AND the message->status. As a side effect, this will correct the wrong behaviour of spi_read and spi_write. Signed-off-by: Marc Pignat --- This is version 2 (previous one didn't compile :-/ ). Regards Marc --- drivers/spi/spi.c.orig 2007-10-25 13:24:09.000000000 +0200 +++ drivers/spi/spi.c 2007-10-25 13:22:23.000000000 +0200 @@ -542,10 +542,7 @@ static void spi_complete(void *arg) * Also, the caller is guaranteeing that the memory associated with the * message will not be freed before this call returns. * - * The return value is a negative error code if the message could not be - * 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. + * It returns zero on success, else a negative error code. */ int spi_sync(struct spi_device *spi, struct spi_message *message) { @@ -555,8 +552,10 @@ int spi_sync(struct spi_device *spi, str message->complete = spi_complete; message->context = &done; status = spi_async(spi, message); - if (status == 0) + if (status == 0) { wait_for_completion(&done); + status = message->status; + } message->context = NULL; return status; } @@ -629,10 +628,8 @@ int spi_write_then_read(struct spi_devic /* do the i/o */ status = spi_sync(spi, &message); - if (status == 0) { + if (status == 0) memcpy(rxbuf, x[1].rx_buf, n_rx); - status = message.status; - } if (x[0].tx_buf == buf) up(&lock); ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/