]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
mtd: fsl-quadspi: cleanup wait_for_completion return handling
authorNicholas Mc Guire <hofrat@osadl.org>
Sun, 1 Feb 2015 11:15:46 +0000 (06:15 -0500)
committerBrian Norris <computersforpeace@gmail.com>
Tue, 31 Mar 2015 01:08:04 +0000 (18:08 -0700)
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@osadl.org>
Acked-by: Han Xu <han.xu@freescale.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
drivers/mtd/spi-nor/fsl-quadspi.c

index c01dd16118887d8f0b50e37d09d1ef727b92b2d5..5d5d36272bb5b3b5d50074e89515e683cb7f6084 100644 (file)
@@ -460,8 +460,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),