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

Commit 9f8abf82 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Jeff Garzik
Browse files

pata_scc: add proper cable detection method 



Use standard ata_cable_80wire() method for the cable detection,
as a bonus this allows us to use the default ->prereset method.

Acked-by: default avatarKou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: default avatarAkira Iguchi <akira2.iguchi@toshiba.co.jp>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 90f0adf0

drivers/ata/pata_scc.c

+1 −13
Original line number Diff line number Diff line
@@ -825,18 +825,6 @@ static unsigned int scc_data_xfer (struct ata_device *dev, unsigned char *buf, 
	return words << 1;

}



/**

 *	scc_pata_prereset - prepare for reset

 *	@ap: ATA port to be reset

 *	@deadline: deadline jiffies for the operation

 */



static int scc_pata_prereset(struct ata_link *link, unsigned long deadline)

{

	link->ap->cbl = ATA_CBL_PATA80;

	return ata_sff_prereset(link, deadline);

}



/**

 *	scc_postreset - standard postreset callback

 *	@ap: the target ata_port
@@ -946,7 +934,7 @@ static struct ata_port_operations scc_pata_ops = { 
	.bmdma_status		= scc_bmdma_status,

	.sff_data_xfer		= scc_data_xfer,



	.prereset		= scc_pata_prereset,

	.cable_detect		= ata_cable_80wire,

	.softreset		= scc_softreset,

	.postreset		= scc_postreset,