[PATCH] libata: remove postreset handling from ata_do_reset()
Make ata_do_reset() deal only with reset. postreset is now the
responsibility of the caller. This is simpler and eases later
prereset addition.
Signed-off-by: Tejun Heo <htejun@gmail.com>
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 1efe8a1..19ae3fa 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -2585,7 +2585,7 @@
}
int ata_do_reset(struct ata_port *ap, ata_reset_fn_t reset,
- ata_postreset_fn_t postreset, unsigned int *classes)
+ unsigned int *classes)
{
int i, rc;
@@ -2609,9 +2609,6 @@
if (classes[i] == ATA_DEV_UNKNOWN)
classes[i] = ATA_DEV_NONE;
- if (postreset)
- postreset(ap, classes);
-
return 0;
}
@@ -2655,7 +2652,7 @@
probeinit(ap);
if (softreset && !sata_set_spd_needed(ap)) {
- rc = ata_do_reset(ap, softreset, postreset, classes);
+ rc = ata_do_reset(ap, softreset, classes);
if (rc == 0 && classes[0] != ATA_DEV_UNKNOWN)
goto done;
printk(KERN_INFO "ata%u: softreset failed, will try "
@@ -2667,7 +2664,7 @@
goto done;
while (1) {
- rc = ata_do_reset(ap, hardreset, postreset, classes);
+ rc = ata_do_reset(ap, hardreset, classes);
if (rc == 0) {
if (classes[0] != ATA_DEV_UNKNOWN)
goto done;
@@ -2688,12 +2685,16 @@
ap->id);
ssleep(5);
- rc = ata_do_reset(ap, softreset, postreset, classes);
+ rc = ata_do_reset(ap, softreset, classes);
}
done:
- if (rc == 0 && classes[0] == ATA_DEV_UNKNOWN)
- rc = -ENODEV;
+ if (rc == 0) {
+ if (postreset)
+ postreset(ap, classes);
+ if (classes[0] == ATA_DEV_UNKNOWN)
+ rc = -ENODEV;
+ }
return rc;
}