From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Thu, 4 Dec 2014 13:15:47 +0000 (-0200)
Subject: spi: spi-fsl-spi: Return an error code in fsl_spi_do_one_msg()
X-Git-Tag: v3.19-rc1~124^2~2^3~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=75c410884aff0c502dcb34cc58997e67e9b61e5f;p=linux.git

spi: spi-fsl-spi: Return an error code in fsl_spi_do_one_msg()

Since commit c592becbe704127 ("spi: fsl-(e)spi: migrate to generic master
queueing") the function fsl_spi_do_one_msg() is not void anymore, so return
an error code to avoid the following buid warning:

   drivers/spi/spi-fsl-spi.c: In function 'fsl_spi_do_one_msg':
>> drivers/spi/spi-fsl-spi.c:374:4: warning: 'return' with no value, in function returning non-void [-Wreturn-type]
       return;
       ^

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index 6b94428a0223..5e02c1f3e145 100644
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -371,7 +371,7 @@ static int fsl_spi_do_one_msg(struct spi_master *master,
 			status = -EINVAL;
 			dev_err(&spi->dev,
 				"bits_per_word/speed_hz should be same for the same SPI transfer\n");
-			return;
+			return -EINVAL;
 		}
 	}