Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  AHCI: Remove an unnecessary flush from ahci_qc_issue
  AHCI: speed up resume
  [libata] Add support for VPD page b1
  ata: endianness annotations in pata drivers
  libata-eh: update atapi_eh_request_sense() to take @dev instead of @qc
  [libata] sata_svw: update code comments relating to data corruption
  libata/ahci: enclosure management support
  libata: improve EH internal command timeout handling
  libata: use ULONG_MAX to terminate reset timeout table
  libata: improve EH retry delay handling
  libata: consistently use msecs for time durations

1 files changed, 2 insertions, 11 deletions

diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c
index 7daf4c0f6216..b65db309c181 100644
--- a/drivers/ata/libata-pmp.c
+++ b/drivers/ata/libata-pmp.c
@@ -727,19 +727,12 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap,
                 }
 
                 if (tries) {
-                        int sleep = ehc->i.flags & ATA_EHI_DID_RESET;
-
                         /* consecutive revalidation failures? speed down */
                         if (reval_failed)
                                 sata_down_spd_limit(link);
                         else
                                 reval_failed = 1;
 
-                        ata_dev_printk(dev, KERN_WARNING,
-                                       "retrying reset%s\n",
-                                       sleep ? " in 5 secs" : "");
-                        if (sleep)
-                                ssleep(5);
                         ehc->i.action |= ATA_EH_RESET;
                         goto retry;
                 } else {
@@ -785,7 +778,8 @@ static int sata_pmp_eh_handle_disabled_links(struct ata_port *ap)
                  * SError.N working.
                  */
                 sata_link_hardreset(link, sata_deb_timing_normal,
-                                jiffies + ATA_TMOUT_INTERNAL_QUICK, NULL, NULL);
+                                ata_deadline(jiffies, ATA_TMOUT_INTERNAL_QUICK),
+                                NULL, NULL);
 
                 /* unconditionally clear SError.N */
                 rc = sata_scr_write(link, SCR_ERROR, SERR_PHYRDY_CHG);
@@ -990,10 +984,7 @@ static int sata_pmp_eh_recover(struct ata_port *ap)
                 goto retry;
 
         if (--pmp_tries) {
-                ata_port_printk(ap, KERN_WARNING,
-                                "failed to recover PMP, retrying in 5 secs\n");
                 pmp_ehc->i.action |= ATA_EH_RESET;
-                ssleep(5);
                 goto retry;
         }