USB: mon_stat.c: move assignment out of if () block

[firefly-linux-kernel-4.4.55.git] / drivers / mtd / spi-nor / fsl-quadspi.c

diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c
index 1c7308c2c77d9b54beb22ad626a0b9d813052a48..5d5d36272bb5b3b5d50074e89515e683cb7f6084 100644 (file)
--- a/drivers/mtd/spi-nor/fsl-quadspi.c
+++ b/drivers/mtd/spi-nor/fsl-quadspi.c
@@ -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),
@@ -830,27 +829,27 @@ static int fsl_qspi_probe(struct platform_device *pdev)
 
        ret = clk_prepare_enable(q->clk_en);
        if (ret) {
-               dev_err(dev, "can not enable the qspi_en clock\n");
+               dev_err(dev, "cannot enable the qspi_en clock: %d\n", ret);
                return ret;
        }
 
        ret = clk_prepare_enable(q->clk);
        if (ret) {
-               dev_err(dev, "can not enable the qspi clock\n");
+               dev_err(dev, "cannot enable the qspi clock: %d\n", ret);
                goto clk_failed;
        }
 
        /* find the irq */
        ret = platform_get_irq(pdev, 0);
        if (ret < 0) {
-               dev_err(dev, "failed to get the irq\n");
+               dev_err(dev, "failed to get the irq: %d\n", ret);
                goto irq_failed;
        }
 
        ret = devm_request_irq(dev, ret,
                        fsl_qspi_irq_handler, 0, pdev->name, q);
        if (ret) {
-               dev_err(dev, "failed to request irq.\n");
+               dev_err(dev, "failed to request irq: %d\n", ret);
                goto irq_failed;
        }