Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0f5aa9c authored by Paul Bolle's avatar Paul Bolle Committed by Tejun Heo
Browse files

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: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent a1a205df

drivers/ata/sata_fsl.c

+0 −14
Original line number Original line Diff line number Diff line
@@ -774,20 +774,6 @@ static int sata_fsl_port_start(struct ata_port *ap) 
	VPRINTK("HControl = 0x%x\n", ioread32(hcr_base + HCONTROL));

	VPRINTK("HControl = 0x%x\n", ioread32(hcr_base + HCONTROL));

	VPRINTK("CHBA  = 0x%x\n", ioread32(hcr_base + CHBA));

	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;

	return 0;

}

}