UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ahci: qoriq: Fix a compiling warning 

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>
This commit is contained in:
Arnd Bergmann 2015-10-14 16:46:52 +08:00 committed by Tejun Heo
parent 3a53b3bcc7
commit eb351031a1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/ata/ahci_qoriq.c
View File

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