sata_fsl: remove check for CONFIG_MPC8315_DS

PATCH Applied Paul Bolle 2 participants 2 messages May 21, 2014 libata

Share & tools

Paul Bolle

author

2014-05-21 19:35 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
Untested.

 drivers/ata/sata_fsl.c | 14 --------------
 1 file changed, 14 deletions(-)

drivers/ata/sata_fsl.c +0 ~~-14~~

index fb0b40a191c2..3f316d61a9d8 100644
@@ -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;
 }

Signature · 1 line

1.9.0

Tejun Heo

Applied

2014-05-21 19:39 UTC #1 lore raw

Quoted 5 lines · Paul Bolle

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 <[email protected]>

Applied to libata/for-3.16.

Thanks.

Signature · 1 line

tejun