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

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

[Fabio Estevam]

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-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> 
Signed-off-by: Fabio Estevam <fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
---
 drivers/spi/spi-fsl-spi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index e24a9bf..83f8081 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;
 		}
 	}
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] spi: spi-fsl-spi: Return an error code in fsl_spi_do_one_msg()

[Fabio Estevam]

On Thu, Dec 4, 2014 at 11:25 AM, Heiner Kallweit <hkallweit1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> Right, missed that. However the code was bogus before, the status = -EINVAL
> didn't make sense as the value of variable status isn't used before the
> return.
> Therefore we can remove the "status = -EINVAL".

Yes, I noticed that as well.

> Shall I submit a patch or what would be your preferred approach?

Yes, may be it would be better if you could submit a fix for this as
separate patch, after Mark applies this one, so that we avoid
conflicts.
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] spi: spi-fsl-spi: Return an error code in fsl_spi_do_one_msg()

[Heiner Kallweit]

Am 04.12.2014 um 15:12 schrieb Fabio Estevam:
> On Thu, Dec 4, 2014 at 11:25 AM, Heiner Kallweit <hkallweit1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>> Right, missed that. However the code was bogus before, the status = -EINVAL
>> didn't make sense as the value of variable status isn't used before the
>> return.
>> Therefore we can remove the "status = -EINVAL".
> 
> Yes, I noticed that as well.
> 
>> Shall I submit a patch or what would be your preferred approach?
> 
> Yes, may be it would be better if you could submit a fix for this as
> separate patch, after Mark applies this one, so that we avoid
> conflicts.
> 
OK, just submitted the fix as a separate patch.

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] spi: spi-fsl-spi: Return an error code in fsl_spi_do_one_msg()

[Fabio Estevam]

On Thu, Dec 4, 2014 at 4:18 PM, Heiner Kallweit <hkallweit1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:

> OK, just submitted the fix as a separate patch.

You mixed the two fixes in one patch. That was not really what I suggested.
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] spi: spi-fsl-spi: Return an error code in fsl_spi_do_one_msg()

[Heiner Kallweit]

Am 04.12.2014 um 19:52 schrieb Fabio Estevam:
> On Thu, Dec 4, 2014 at 4:18 PM, Heiner Kallweit <hkallweit1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> 
>> OK, just submitted the fix as a separate patch.
> 
> You mixed the two fixes in one patch. That was not really what I suggested.
> 
Sorry, was a misunderstanding. I re-sent the fix with only removing the
unused variable assignment.

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] spi: spi-fsl-spi: Return an error code in fsl_spi_do_one_msg()

[Heiner Kallweit]

Right, missed that. However the code was bogus before, the status =
-EINVAL didn't make sense as the value of variable status isn't used
before the return.
Therefore we can remove the "status = -EINVAL".
Shall I submit a patch or what would be your preferred approach?

On Thu, Dec 4, 2014 at 2:15 PM, Fabio Estevam
<fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org> wrote:
> 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-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> Signed-off-by: Fabio Estevam <fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
> ---
>  drivers/spi/spi-fsl-spi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
> index e24a9bf..83f8081 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;
>                 }
>         }
>
> --
> 1.9.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] spi: spi-fsl-spi: Return an error code in fsl_spi_do_one_msg()

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 288 bytes --]

On Thu, Dec 04, 2014 at 11:15:47AM -0200, Fabio Estevam wrote:
> 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:

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]