ahci: qoriq: Fix a compiling warning
authorArnd Bergmann <arnd@arndb.de>
Wed, 14 Oct 2015 08:46:52 +0000 (16:46 +0800)
committerTejun Heo <tj@kernel.org>
Thu, 15 Oct 2015 16:03:00 +0000 (12:03 -0400)
kbuild test robot reports the warnings:
drivers/ata/ahci_qoriq.c: In function 'ahci_qoriq_hardreset':
>> include/asm-generic/io.h:163:2: warning: 'px_is' may be used
>> uninitialized in this function [-Wuninitialized]
drivers/ata/ahci_qoriq.c:70:14: note: 'px_is' was declared here
>> include/asm-generic/io.h:163:2: warning: 'px_cmd' may be used
>> uninitialized in this function [-Wuninitialized]
drivers/ata/ahci_qoriq.c:70:6: note: 'px_cmd' was declared here

This patch fixed it by introducing a local variable.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
drivers/ata/ahci_qoriq.c

index e5e4988125542b7e9ce3f794317807cefed560a5..58c1a94b9a41631537b9b05fd8cc35e9cdb8143f 100644 (file)
@@ -76,6 +76,7 @@ static int ahci_qoriq_hardreset(struct ata_link *link, unsigned int *class,
        struct ata_taskfile tf;
        bool online;
        int rc;
+       bool ls1021a_workaround = (qoriq_priv->type == AHCI_LS1021A);
 
        DPRINTK("ENTER\n");
 
@@ -92,7 +93,7 @@ static int ahci_qoriq_hardreset(struct ata_link *link, unsigned int *class,
         * After the sequence is complete, software should restore the
         * PxCMD and PxIS with the stored values.
         */
-       if (qoriq_priv->type == AHCI_LS1021A) {
+       if (ls1021a_workaround) {
                px_cmd = readl(port_mmio + PORT_CMD);
                px_is = readl(port_mmio + PORT_IRQ_STAT);
        }
@@ -106,7 +107,7 @@ static int ahci_qoriq_hardreset(struct ata_link *link, unsigned int *class,
                                 ahci_check_ready);
 
        /* restore the PxCMD and PxIS on ls1021 */
-       if (qoriq_priv->type == AHCI_LS1021A) {
+       if (ls1021a_workaround) {
                px_val = readl(port_mmio + PORT_CMD);
                if (px_val != px_cmd)
                        writel(px_cmd, port_mmio + PORT_CMD);