[U-Boot] [PATCH] ATA: Squash warnings in mxc_ata.

Marek Vasut
2011-09-23T09:12:11Z

drivers/block/mxc_ata.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/block/mxc_ata.c b/drivers/block/mxc_ata.c
index f22f4f4..d94ec9c 100644
--- a/drivers/block/mxc_ata.c
+++ b/drivers/block/mxc_ata.c
@@ -98,6 +98,7 @@ static void set_ata_bus_timing(unsigned char mode)
{
uint32_t val;
uint32_t T = 1000000000 / mxc_get_clock(MXC_IPG_CLK);
+ uint32_t reg;

struct mxc_ata_config_regs *ata_regs;
ata_regs = (struct mxc_ata_config_regs *)CONFIG_SYS_ATA_BASE_ADDR;
@@ -106,22 +107,25 @@ static void set_ata_bus_timing(unsigned char mode)
return;

/* Write TIME_OFF/ON/1/2W */
+ reg = (uint32_t)&ata_regs->time_off;
val = (3 << REG2OFF(&ata_regs->time_off)) |
(3 << REG2OFF(&ata_regs->time_on)) |
(((pio_t1[mode] + T) / T) << REG2OFF(&ata_regs->time_1)) |
(((pio_t2_8[mode] + T) / T) << REG2OFF(&ata_regs->time_2w));
- writel(val, &ata_regs->time_off);
+ writel(val, reg);

/* Write TIME_2R/AX/RDX/4 */
+ reg = (uint32_t)&ata_regs->time_2r;
val = (((pio_t2_8[mode] + T) / T) << REG2OFF(&ata_regs->time_2r)) |
(((pio_tA[mode] + T) / T + 2) << REG2OFF(&ata_regs->time_ax)) |
(1 << REG2OFF(&ata_regs->time_pio_rdx)) |
(((pio_t4[mode] + T) / T) << REG2OFF(&ata_regs->time_4));
- writel(val, &ata_regs->time_2r);
+ writel(val, reg);

/* Write TIME_9 ; the rest of timing registers is irrelevant for PIO */
+ reg = (uint32_t)&ata_regs->time_9;
val = (((pio_t9[mode] + T) / T) << REG2OFF(&ata_regs->time_9));
- writel(val, &ata_regs->time_9);
+ writel(val, reg);