3 files changed, 41 insertions, 21 deletions

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index c5e4501daa74..939dc1d4e50d 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1444,7 +1444,7 @@ static void ahci_postreset(struct ata_link *link, unsigned int *class)
         void __iomem *port_mmio = ahci_port_base(ap);
         u32 new_tmp, tmp;
 
-        ata_sff_postreset(link, class);
+        ata_std_postreset(link, class);
 
         /* Make sure port's ATAPI bit is set appropriately */
         new_tmp = tmp = readl(port_mmio + PORT_CMD);
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 5f771bb44332..eaead76c9443 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -76,7 +76,7 @@ const unsigned long sata_deb_timing_long[]		= { 100, 2000, 5000 };
 const struct ata_port_operations ata_base_port_ops = {
         .prereset               = ata_std_prereset,
         .hardreset              = sata_sff_hardreset,
-        .postreset              = ata_sff_postreset,
+        .postreset              = ata_std_postreset,
         .error_handler          = ata_std_error_handler,
 };
 
@@ -3516,7 +3516,7 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing,
 }
 
 /**
- *      ata_sff_postreset - standard postreset callback
+ *      ata_std_postreset - standard postreset callback
  *      @link: the target ata_link
  *      @classes: classes of attached devices
  *
@@ -3527,9 +3527,8 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing,
  *      LOCKING:
  *      Kernel thread context (may sleep)
  */
-void ata_sff_postreset(struct ata_link *link, unsigned int *classes)
+void ata_std_postreset(struct ata_link *link, unsigned int *classes)
 {
-        struct ata_port *ap = link->ap;
         u32 serror;
 
         DPRINTK("ENTER\n");
@@ -3542,22 +3541,6 @@ void ata_sff_postreset(struct ata_link *link, unsigned int *classes)
                 sata_scr_write(link, SCR_ERROR, serror);
         link->eh_info.serror = 0;
 
-        /* is double-select really necessary? */
-        if (classes[0] != ATA_DEV_NONE)
-                ap->ops->sff_dev_select(ap, 1);
-        if (classes[1] != ATA_DEV_NONE)
-                ap->ops->sff_dev_select(ap, 0);
-
-        /* bail out if no device is present */
-        if (classes[0] == ATA_DEV_NONE && classes[1] == ATA_DEV_NONE) {
-                DPRINTK("EXIT, no device\n");
-                return;
-        }
-
-        /* set up device control */
-        if (ap->ioaddr.ctl_addr)
-                iowrite8(ap->ctl, ap->ioaddr.ctl_addr);
-
         DPRINTK("EXIT\n");
 }
 
@@ -6096,6 +6079,7 @@ EXPORT_SYMBOL_GPL(sata_link_debounce);
 EXPORT_SYMBOL_GPL(sata_link_resume);
 EXPORT_SYMBOL_GPL(ata_std_prereset);
 EXPORT_SYMBOL_GPL(sata_link_hardreset);
+EXPORT_SYMBOL_GPL(ata_std_postreset);
 EXPORT_SYMBOL_GPL(ata_dev_classify);
 EXPORT_SYMBOL_GPL(ata_dev_pair);
 EXPORT_SYMBOL_GPL(ata_port_disable);
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 9234bc047956..e530baccc9cb 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -49,6 +49,7 @@ const struct ata_port_operations ata_sff_port_ops = {
         .thaw                   = ata_sff_thaw,
         .prereset               = ata_sff_prereset,
         .softreset              = ata_sff_softreset,
+        .postreset              = ata_sff_postreset,
         .error_handler          = ata_sff_error_handler,
         .post_internal_cmd      = ata_sff_post_internal_cmd,
 
@@ -2032,6 +2033,41 @@ int sata_sff_hardreset(struct ata_link *link, unsigned int *class,
 }
 
 /**
+ *      ata_sff_postreset - SFF postreset callback
+ *      @link: the target SFF ata_link
+ *      @classes: classes of attached devices
+ *
+ *      This function is invoked after a successful reset.  It first
+ *      calls ata_std_postreset() and performs SFF specific postreset
+ *      processing.
+ *
+ *      LOCKING:
+ *      Kernel thread context (may sleep)
+ */
+void ata_sff_postreset(struct ata_link *link, unsigned int *classes)
+{
+        struct ata_port *ap = link->ap;
+
+        ata_std_postreset(link, classes);
+
+        /* is double-select really necessary? */
+        if (classes[0] != ATA_DEV_NONE)
+                ap->ops->sff_dev_select(ap, 1);
+        if (classes[1] != ATA_DEV_NONE)
+                ap->ops->sff_dev_select(ap, 0);
+
+        /* bail out if no device is present */
+        if (classes[0] == ATA_DEV_NONE && classes[1] == ATA_DEV_NONE) {
+                DPRINTK("EXIT, no device\n");
+                return;
+        }
+
+        /* set up device control */
+        if (ap->ioaddr.ctl_addr)
+                iowrite8(ap->ctl, ap->ioaddr.ctl_addr);
+}
+
+/**
  *      ata_sff_error_handler - Stock error handler for BMDMA controller
  *      @ap: port to handle error for
  *