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: Kou Ishizaki <kou.ishizaki@toshiba.co.jp> Acked-by: Akira Iguchi <akira2.iguchi@toshiba.co.jp> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Родитель
90f0adf093
Коммит
9f8abf8248
|
@ -825,18 +825,6 @@ static unsigned int scc_data_xfer (struct ata_device *dev, unsigned char *buf,
|
||||||
return words << 1;
|
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
|
* scc_postreset - standard postreset callback
|
||||||
* @ap: the target ata_port
|
* @ap: the target ata_port
|
||||||
|
@ -946,7 +934,7 @@ static struct ata_port_operations scc_pata_ops = {
|
||||||
.bmdma_status = scc_bmdma_status,
|
.bmdma_status = scc_bmdma_status,
|
||||||
.sff_data_xfer = scc_data_xfer,
|
.sff_data_xfer = scc_data_xfer,
|
||||||
|
|
||||||
.prereset = scc_pata_prereset,
|
.cable_detect = ata_cable_80wire,
|
||||||
.softreset = scc_softreset,
|
.softreset = scc_softreset,
|
||||||
.postreset = scc_postreset,
|
.postreset = scc_postreset,
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче