summaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_scc.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-09-02 23:23:57 +0900
committerJeff Garzik <jeff@garzik.org>2007-10-12 14:55:39 -0400
commit3f19859ee95a38c066a0420eb8a30c76ecd67a42 (patch)
tree0ad611a48ddb18be3b8ec35e4dc318e2fd344961 /drivers/ata/pata_scc.c
parent7a234aff3d83728fd83cf19df32d3df52566d2ac (diff)
downloadlinux-3f19859ee95a38c066a0420eb8a30c76ecd67a42.tar.gz
linux-3f19859ee95a38c066a0420eb8a30c76ecd67a42.tar.bz2
linux-3f19859ee95a38c066a0420eb8a30c76ecd67a42.zip
libata: update ata_dev_try_classify() arguments
Make ata_dev_try_classify() take a pointer to ata_device instead of ata_port/port_number combination for consistency and add @present argument. @present indicates whether the device seems present during reset. It's the result of TF access during softreset and link onlineness during hardreset. @present will be used to improve diagnostic failure handling. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/pata_scc.c')
-rw-r--r--drivers/ata/pata_scc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index 2153def3f345..941b72bec836 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -636,9 +636,11 @@ static int scc_std_softreset (struct ata_port *ap, unsigned int *classes,
}
/* determine by signature whether we have ATA or ATAPI devices */
- classes[0] = ata_dev_try_classify(ap, 0, &err);
+ classes[0] = ata_dev_try_classify(&ap->link.device[0],
+ devmask & (1 << 0), &err);
if (slave_possible && err != 0x81)
- classes[1] = ata_dev_try_classify(ap, 1, &err);
+ classes[1] = ata_dev_try_classify(&ap->link.device[1],
+ devmask & (1 << 1), &err);
out:
DPRINTK("EXIT, classes[0]=%u [1]=%u\n", classes[0], classes[1]);