summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/port.c
diff options
context:
space:
mode:
authorDave Jiang <dave.jiang@intel.com>2011-05-05 00:37:52 +0200
committerDan Williams <dan.j.williams@intel.com>2011-07-03 13:04:46 +0200
commit4b7ebd05fc074ac2ffdc803232d83f3593d4f548 (patch)
tree697af2c3f57dd5ce58f092d1806f35ce22c614ee /drivers/scsi/isci/port.c
parentisci: Convert ATA defines to Linux native defines (diff)
downloadlinux-4b7ebd05fc074ac2ffdc803232d83f3593d4f548.tar.xz
linux-4b7ebd05fc074ac2ffdc803232d83f3593d4f548.zip
isci: Convert SAS identify address frame to Linux Native format
Convert struct sci_sas_identify_address_frame to struct sas_identify_frame Signed-off-by: Dave Jiang <dave.jiang@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/port.c')
-rw-r--r--drivers/scsi/isci/port.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/scsi/isci/port.c b/drivers/scsi/isci/port.c
index 5b38f2f963e0..0a1577327d61 100644
--- a/drivers/scsi/isci/port.c
+++ b/drivers/scsi/isci/port.c
@@ -236,18 +236,12 @@ void isci_port_link_up(
BUG_ON(call_status != SCI_SUCCESS);
- memcpy(isci_phy->frame_rcvd.aif,
- &(sas_phy_properties.received_iaf),
- sizeof(struct sci_sas_identify_address_frame));
-
- isci_phy->sas_phy.frame_rcvd_size
- = sizeof(struct sci_sas_identify_address_frame);
+ isci_phy->frame_rcvd.iaf = sas_phy_properties.rcvd_iaf;
+ isci_phy->sas_phy.frame_rcvd_size = sizeof(struct sas_identify_frame);
/* Copy the attached SAS address from the IAF */
memcpy(isci_phy->sas_phy.attached_sas_addr,
- ((struct sas_identify_frame *)
- (&isci_phy->frame_rcvd.aif))->sas_addr,
- SAS_ADDR_SIZE);
+ isci_phy->frame_rcvd.iaf.sas_addr, SAS_ADDR_SIZE);
} else {
dev_err(&isci_host->pdev->dev, "%s: unkown target\n", __func__);