From d5e76bc49ab9b247579bd3547dda784cfe7770ca Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Mon, 22 Oct 2012 16:58:30 +0800 Subject: [PATCH] --- yaml --- r: 344412 b: refs/heads/master c: 7f0658d37f2d9a3a251f5b0bf1877eb9ec593f04 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/sata_inic162x.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a5426fa9fe0b..7d81a371dc36 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b34f2cc99df7275652ac6b522a767d750a02b3a +refs/heads/master: 7f0658d37f2d9a3a251f5b0bf1877eb9ec593f04 diff --git a/trunk/drivers/ata/sata_inic162x.c b/trunk/drivers/ata/sata_inic162x.c index dc35f4d42b8b..1e6827c89429 100644 --- a/trunk/drivers/ata/sata_inic162x.c +++ b/trunk/drivers/ata/sata_inic162x.c @@ -273,12 +273,10 @@ static void inic_reset_port(void __iomem *port_base) static int inic_scr_read(struct ata_link *link, unsigned sc_reg, u32 *val) { void __iomem *scr_addr = inic_port_base(link->ap) + PORT_SCR; - void __iomem *addr; if (unlikely(sc_reg >= ARRAY_SIZE(scr_map))) return -EINVAL; - addr = scr_addr + scr_map[sc_reg] * 4; *val = readl(scr_addr + scr_map[sc_reg] * 4); /* this controller has stuck DIAG.N, ignore it */