sata_fsl: remove check for CONFIG_MPC8315_DS

A check for CONFIG_MPC8315_DS was added in v2.6.24. But the related
Kconfig symbol was never added to the tree. So the code behind this
check has effectively been dead for over six years. Remove it.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Tejun Heo <tj@kernel.org>
(cherry picked from commit d0f5aa9cf6a479884cda95018363ba9ed31d9cbd)

diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 939b4f042f08b0c37385c840e8f752a30d5aab3b..db3c29d6a105641ded5f366250eef2fb612d7ecc 100644 (file)
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -774,20 +774,6 @@ static int sata_fsl_port_start(struct ata_port *ap)
        VPRINTK("HControl = 0x%x\n", ioread32(hcr_base + HCONTROL));
        VPRINTK("CHBA  = 0x%x\n", ioread32(hcr_base + CHBA));
 
-#ifdef CONFIG_MPC8315_DS
-       /*
-        * Workaround for 8315DS board 3gbps link-up issue,
-        * currently limit SATA port to GEN1 speed
-        */
-       sata_fsl_scr_read(&ap->link, SCR_CONTROL, &temp);
-       temp &= ~(0xF << 4);
-       temp |= (0x1 << 4);
-       sata_fsl_scr_write(&ap->link, SCR_CONTROL, temp);
-
-       sata_fsl_scr_read(&ap->link, SCR_CONTROL, &temp);
-       dev_warn(dev, "scr_control, speed limited to %x\n", temp);
-#endif
-
        return 0;
 }