From 305d2a1ab137d11d573319c315748a87060fe82d Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 7 Apr 2008 22:47:20 +0900 Subject: libata: unify mechanism to request follow-up SRST Previously, there were two ways to trigger follow-up SRST from hardreset method - returning -EAGAIN and leaving all device classes unmodified. Drivers never used the latter mechanism and the only use case for the former was when hardreset couldn't classify. Drop the latter mechanism and let -EAGAIN mean "perform follow-up SRST if classification is required". This change removes unnecessary follow-up SRSTs and simplifies reset implementations. Signed-off-by: Tejun Heo --- drivers/ata/ahci.c | 3 --- drivers/ata/libata-core.c | 1 - drivers/ata/libata-eh.c | 26 ++++++++------------------ drivers/ata/libata-sff.c | 1 - 4 files changed, 8 insertions(+), 23 deletions(-) (limited to 'drivers') diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index a69bcca4eb1..3071a2341be 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1365,7 +1365,6 @@ static int ahci_hardreset(struct ata_link *link, unsigned int *class, ahci_start_engine(ap); - *class = ATA_DEV_NONE; if (online) *class = ahci_dev_classify(ap); @@ -1394,7 +1393,6 @@ static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, /* vt8251 doesn't clear BSY on signature FIS reception, * request follow-up softreset. */ - *class = ATA_DEV_NONE; return online ? -EAGAIN : rc; } @@ -1439,7 +1437,6 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, if (rc) ahci_kick_engine(ap, 0); } - *class = ATA_DEV_NONE; return rc; } diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 2da579b46bd..51876b93c1b 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -3701,7 +3701,6 @@ int sata_std_hardreset(struct ata_link *link, unsigned int *class, /* do hardreset */ rc = sata_link_hardreset(link, timing, deadline, &online, NULL); - *class = ATA_DEV_NONE; return online ? -EAGAIN : rc; } diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index d8c4a45dcf2..4ec1397434c 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -2055,20 +2055,10 @@ static int ata_do_reset(struct ata_link *link, ata_reset_fn_t reset, if (rc) return rc; - /* If any class isn't ATA_DEV_UNKNOWN, consider classification - * is complete and convert all ATA_DEV_UNKNOWN to - * ATA_DEV_NONE. - */ + /* convert all ATA_DEV_UNKNOWN to ATA_DEV_NONE */ ata_link_for_each_dev(dev, link) - if (classes[dev->devno] != ATA_DEV_UNKNOWN) - break; - - if (dev) { - ata_link_for_each_dev(dev, link) { - if (classes[dev->devno] == ATA_DEV_UNKNOWN) - classes[dev->devno] = ATA_DEV_NONE; - } - } + if (classes[dev->devno] == ATA_DEV_UNKNOWN) + classes[dev->devno] = ATA_DEV_NONE; return 0; } @@ -2079,15 +2069,15 @@ static int ata_eh_followup_srst_needed(struct ata_link *link, { if (link->flags & ATA_LFLAG_NO_SRST) return 0; - if (rc == -EAGAIN) - return 1; + if (rc == -EAGAIN) { + if (classify) + return 1; + rc = 0; + } if (rc != 0) return 0; if ((link->ap->flags & ATA_FLAG_PMP) && ata_is_host_link(link)) return 1; - if (classify && !(link->flags & ATA_LFLAG_ASSUME_CLASS) && - classes[0] == ATA_DEV_UNKNOWN) - return 1; return 0; } diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index f464ca1fa26..5be8a6058da 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c @@ -1929,7 +1929,6 @@ int sata_sff_hardreset(struct ata_link *link, unsigned int *class, rc = sata_link_hardreset(link, timing, deadline, &online, ata_sff_check_ready); - *class = ATA_DEV_NONE; if (online) *class = ata_sff_dev_classify(link->device, 1, NULL); -- cgit v1.2.3