[PATCH] spi: fsl-quadspi: cleanup wait_for_completion return handling

Han Xu xhnjupt at gmail.com
Tue Feb 10 20:00:01 PST 2015


On Sun, Feb 1, 2015 at 5:15 AM, Nicholas Mc Guire <hofrat at osadl.org> wrote:
> return type of wait_for_completion_timeout is unsigned long not int, this
> patch uses the return value of wait_for_completion_timeout in the condition
> directly rather than adding a additional appropriately typed variable.
>
> Signed-off-by: Nicholas Mc Guire <hofrat at osadl.org>
> ---
>
> As the returnvalue of wait_for_completion_timeout is logically treated here
> as a boolean (timeout occured or not) it can be wrapped into the if condition
> directly and no additional variable is needed.
>
> This patch was only compile tested with imx_v6_v7_defconfig
> (implies CONFIG_SPI_FSL_QUADSPI=y)
>
> Patch is against 3.19.0-rc6 -next-20150130
>
>  drivers/mtd/spi-nor/fsl-quadspi.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c
> index a46bea3..2543b5c 100644
> --- a/drivers/mtd/spi-nor/fsl-quadspi.c
> +++ b/drivers/mtd/spi-nor/fsl-quadspi.c
> @@ -455,8 +455,7 @@ fsl_qspi_runcmd(struct fsl_qspi *q, u8 cmd, unsigned int addr, int len)
>         writel((seqid << QUADSPI_IPCR_SEQID_SHIFT) | len, base + QUADSPI_IPCR);
>
>         /* Wait for the interrupt. */
> -       err = wait_for_completion_timeout(&q->c, msecs_to_jiffies(1000));
> -       if (!err) {
> +       if (!wait_for_completion_timeout(&q->c, msecs_to_jiffies(1000))) {
>                 dev_err(q->dev,
>                         "cmd 0x%.2x timeout, addr@%.8x, FR:0x%.8x, SR:0x%.8x\n",
>                         cmd, addr, readl(base + QUADSPI_FR),
> --
> 1.7.10.4
>

Acked-by: Han Xu <han.xu at freescale.com>

>
> ______________________________________________________
> Linux MTD discussion mailing list
> http://lists.infradead.org/mailman/listinfo/linux-mtd/



More information about the linux-mtd mailing list