Merge remote-tracking branch 'asoc/fix/arizona' into asoc-next

[karo-tx-linux.git] / drivers / ata / sata_sil24.c

diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index a5f2a563a26a139993b9c3d58902ccbc73054f87..59f0d630d634c7ff0c993f4780dbc7b55e682aff 100644 (file)
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -506,8 +506,6 @@ static int sil24_scr_read(struct ata_link *link, unsigned sc_reg, u32 *val)
        void __iomem *scr_addr = sil24_port_base(link->ap) + PORT_SCONTROL;
 
        if (sc_reg < ARRAY_SIZE(sil24_scr_map)) {
-               void __iomem *addr;
-               addr = scr_addr + sil24_scr_map[sc_reg] * 4;
                *val = readl(scr_addr + sil24_scr_map[sc_reg] * 4);
                return 0;
        }
@@ -519,8 +517,6 @@ static int sil24_scr_write(struct ata_link *link, unsigned sc_reg, u32 val)
        void __iomem *scr_addr = sil24_port_base(link->ap) + PORT_SCONTROL;
 
        if (sc_reg < ARRAY_SIZE(sil24_scr_map)) {
-               void __iomem *addr;
-               addr = scr_addr + sil24_scr_map[sc_reg] * 4;
                writel(val, scr_addr + sil24_scr_map[sc_reg] * 4);
                return 0;
        }