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

* 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (119 commits)
  [libata] struct pci_dev related cleanups
  libata: use ata_exec_internal() for PMP register access
  libata: implement ATA_PFLAG_RESETTING
  libata: add @timeout to ata_exec_internal[_sg]()
  ahci: fix notification handling
  ahci: clean up PORT_IRQ_BAD_PMP enabling
  ahci: kill leftover from enabling NCQ over PMP
  libata: wrap schedule_timeout_uninterruptible() in loop
  libata: skip suppress reporting if ATA_EHI_QUIET
  libata: clear ehi description after initial host report
  pata_jmicron: match vendor and class code only
  libata: add ST9160821AS / 3.ALD to NCQ blacklist
  pata_acpi: ACPI driver support
  libata-core: Expose gtm methods for driver use
  libata: add HDT722516DLA380 to NCQ blacklist
  libata: blacklist NCQ on Seagate Barracuda ST380817AS
  [libata] Turn on ACPI by default
  libata_scsi: Fix ATAPI transfer lengths
  libata: correct handling of SRST reset sequences
  libata: Integrate ACPI-based PATA/SATA hotplug - version 5
  ...

2 files changed, 14 insertions, 16 deletions

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index f142eafb6fc7..b41dfb539021 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -3829,18 +3829,18 @@ static int ipr_device_reset(struct ipr_ioa_cfg *ioa_cfg,
 
 /**
  * ipr_sata_reset - Reset the SATA port
- * @ap:         SATA port to reset
+ * @link:       SATA link to reset
  * @classes:    class of the attached device
  *
- * This function issues a SATA phy reset to the affected ATA port.
+ * This function issues a SATA phy reset to the affected ATA link.
  *
  * Return value:
  *      0 on success / non-zero on failure
  **/
-static int ipr_sata_reset(struct ata_port *ap, unsigned int *classes,
+static int ipr_sata_reset(struct ata_link *link, unsigned int *classes,
                                 unsigned long deadline)
 {
-        struct ipr_sata_port *sata_port = ap->private_data;
+        struct ipr_sata_port *sata_port = link->ap->private_data;
         struct ipr_ioa_cfg *ioa_cfg = sata_port->ioa_cfg;
         struct ipr_resource_entry *res;
         unsigned long lock_flags = 0;
@@ -4981,22 +4981,22 @@ static void ipr_ata_phy_reset(struct ata_port *ap)
         rc = ipr_device_reset(ioa_cfg, res);
 
         if (rc) {
-                ap->ops->port_disable(ap);
+                ata_port_disable(ap);
                 goto out_unlock;
         }
 
         switch(res->cfgte.proto) {
         case IPR_PROTO_SATA:
         case IPR_PROTO_SAS_STP:
-                ap->device[0].class = ATA_DEV_ATA;
+                ap->link.device[0].class = ATA_DEV_ATA;
                 break;
         case IPR_PROTO_SATA_ATAPI:
         case IPR_PROTO_SAS_STP_ATAPI:
-                ap->device[0].class = ATA_DEV_ATAPI;
+                ap->link.device[0].class = ATA_DEV_ATAPI;
                 break;
         default:
-                ap->device[0].class = ATA_DEV_UNKNOWN;
-                ap->ops->port_disable(ap);
+                ap->link.device[0].class = ATA_DEV_UNKNOWN;
+                ata_port_disable(ap);
                 break;
         };
 
@@ -5262,7 +5262,6 @@ static u8 ipr_ata_check_altstatus(struct ata_port *ap)
 }
 
 static struct ata_port_operations ipr_sata_ops = {
-        .port_disable = ata_port_disable,
         .check_status = ipr_ata_check_status,
         .check_altstatus = ipr_ata_check_altstatus,
         .dev_select = ata_noop_dev_select,
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 5e573efcf0a7..0829b55c64d2 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -249,17 +249,17 @@ static void sas_ata_phy_reset(struct ata_port *ap)
         switch (dev->sata_dev.command_set) {
                 case ATA_COMMAND_SET:
                         SAS_DPRINTK("%s: Found ATA device.\n", __FUNCTION__);
-                        ap->device[0].class = ATA_DEV_ATA;
+                        ap->link.device[0].class = ATA_DEV_ATA;
                         break;
                 case ATAPI_COMMAND_SET:
                         SAS_DPRINTK("%s: Found ATAPI device.\n", __FUNCTION__);
-                        ap->device[0].class = ATA_DEV_ATAPI;
+                        ap->link.device[0].class = ATA_DEV_ATAPI;
                         break;
                 default:
                         SAS_DPRINTK("%s: Unknown SATA command set: %d.\n",
                                     __FUNCTION__,
                                     dev->sata_dev.command_set);
-                        ap->device[0].class = ATA_DEV_UNKNOWN;
+                        ap->link.device[0].class = ATA_DEV_UNKNOWN;
                         break;
         }
 
@@ -317,7 +317,7 @@ static int sas_ata_scr_write(struct ata_port *ap, unsigned int sc_reg_in,
                         dev->sata_dev.serror = val;
                         break;
                 case SCR_ACTIVE:
-                        dev->sata_dev.ap->sactive = val;
+                        dev->sata_dev.ap->link.sactive = val;
                         break;
                 default:
                         return -EINVAL;
@@ -342,7 +342,7 @@ static int sas_ata_scr_read(struct ata_port *ap, unsigned int sc_reg_in,
                         *val = dev->sata_dev.serror;
                         return 0;
                 case SCR_ACTIVE:
-                        *val = dev->sata_dev.ap->sactive;
+                        *val = dev->sata_dev.ap->link.sactive;
                         return 0;
                 default:
                         return -EINVAL;
@@ -350,7 +350,6 @@ static int sas_ata_scr_read(struct ata_port *ap, unsigned int sc_reg_in,
 }
 
 static struct ata_port_operations sas_sata_ops = {
-        .port_disable           = ata_port_disable,
         .check_status           = sas_ata_check_status,
         .check_altstatus        = sas_ata_check_status,
         .dev_select             = ata_noop_dev_select,