libata-link: introduce ata_link

Introduce ata_link.  It abstracts PHY and sits between ata_port and
ata_device.  This new level of abstraction is necessary to support
SATA Port Multiplier, which basically adds a bunch of links (PHYs) to
a ATA host port.  Fields related to command execution, spd_limit and
EH are per-link and thus moved to ata_link.

This patch only defines the host link.  Multiple link handling will be
added later.  Also, a lot of ap->link derefences are added but many of
them will be removed as each part is converted to deal directly with
ata_link instead of ata_port.

This patch introduces no behavior change.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

2 files changed, 8 insertions, 8 deletions

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index f142eafb6fc7..affd77aafb23 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -4988,14 +4988,14 @@ static void ipr_ata_phy_reset(struct ata_port *ap)
         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->link.device[0].class = ATA_DEV_UNKNOWN;
                 ap->ops->port_disable(ap);
                 break;
         };
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 5e573efcf0a7..1d6503d85f02 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;