lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

isci: copy the oem parameters instead of assign

Browse Source 
Since the data structure for oem from orom/efi/firmware is the same as what
the core uses, we can just do a direct copy instead of assignment.

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dave Jiang 2011-02-24 17:45:57 -08:00 committed by Dan Williams
parent ca507b98e6
commit 02839a8b51
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/scsi/isci/probe_roms.c
View File

@ -92,24 +92,14 @@ struct isci_orom *isci_request_oprom(struct pci_dev *pdev)
enum sci_status isci_parse_oem_parameters(union scic_oem_parameters *oem_params,
struct isci_orom *orom, int scu_index)
{
int i;
/* check for valid inputs */
if (!(scu_index >= 0
&& scu_index < SCI_MAX_CONTROLLERS
&& oem_params != NULL))
if (scu_index < 0 || scu_index > SCI_MAX_CONTROLLERS ||
scu_index > orom->hdr.num_elements || !oem_params)
return -EINVAL;
for (i = 0; i < SCI_MAX_PHYS; i++) {
oem_params->sds1.phys[i].sas_address.low =
orom->ctrl[scu_index].phys[i].sas_address.low;
oem_params->sds1.phys[i].sas_address.high =
orom->ctrl[scu_index].phys[i].sas_address.high;
}
for (i = 0; i < SCI_MAX_PORTS; i++)
oem_params->sds1.ports[i].phy_mask =
orom->ctrl[scu_index].ports[i].phy_mask;
memcpy(oem_params,
&orom->ctrl[scu_index],
sizeof(struct scic_sds_oem_params));
return 0;
}