libata: move EH repeat reporting into ata_eh_report()

EH is sometimes repeated without any error or action.  For example,
this happens when probing IDENTIFY fails because of a phantom device.
In these cases, all the repeated EH does is making sure there is no
unhandled error or pending action and return.  This repeation is
necessary to avoid losing any event which occurred while EH was in
progress.

Unfortunately, this dry run causes annonying "EH pending after
completion" message.  This patch moves the repeat reporting into
ata_eh_report() such that it's more compact and skipped on dry runs.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Mikael Pettersson <mikep@it.uu.se>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index d3defae689ca..74e034ea9016 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -293,8 +293,8 @@ enum {
         ATA_EHI_DID_RESET       = ATA_EHI_DID_SOFTRESET | ATA_EHI_DID_HARDRESET,
         ATA_EHI_RESET_MODIFIER_MASK = ATA_EHI_RESUME_LINK,
 
-        /* max repeat if error condition is still set after ->error_handler */
-        ATA_EH_MAX_REPEAT       = 5,
+        /* max tries if error condition is still set after ->error_handler */
+        ATA_EH_MAX_TRIES        = 5,
 
         /* how hard are we gonna try to probe/recover devices */
         ATA_PROBE_MAX_TRIES     = 3,
@@ -581,6 +581,7 @@ struct ata_port {
         u32                     msg_enable;
         struct list_head        eh_done_q;
         wait_queue_head_t       eh_wait_q;
+        int                     eh_tries;
 
         pm_message_t            pm_mesg;
         int                     *pm_result;