summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2011-10-12 17:16:37 +0200
committerJeff Garzik <jgarzik@redhat.com>2011-10-14 13:19:51 -0400
commit9f8abf8248f8b90532a201845654d467f4388474 (patch)
tree3d49b311b3f7e58203ca58efe07736acae69d8cf /drivers/ata
parent90f0adf0936d464a337512e6cbe7929a49bf3c55 (diff)
downloadlinux-9f8abf8248f8b90532a201845654d467f4388474.tar.bz2
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>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/pata_scc.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index eb748e327143..e265f835c95d 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -826,18 +826,6 @@ static unsigned int scc_data_xfer (struct ata_device *dev, unsigned char *buf,
}
/**
- * 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
* @classes: classes of attached devices
@@ -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,