aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/init.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2011-04-21 21:14:45 -0400
committerDan Williams <dan.j.williams@intel.com>2011-07-03 07:00:38 -0400
commit57f20f4ed6fb702339be2ef4dea9d15e6a7d0d07 (patch)
treed31db747f233d5ea790e82b64e233ee762cf2cdf /drivers/scsi/isci/init.c
parent9614395ea2eed076fa8341df422582b0017d330c (diff)
isci: unify remote_device data structures
Make it explicit that isci_remote_device and scic_sds_remote_device are one in the same object. Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/init.c')
-rw-r--r--drivers/scsi/isci/init.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index 5a9cd5fbeab9..a23ea2c1c7db 100644
--- a/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@ -396,10 +396,7 @@ static struct isci_host *isci_host_alloc(struct pci_dev *pdev, int id)
396 struct Scsi_Host *shost; 396 struct Scsi_Host *shost;
397 int err; 397 int err;
398 398
399 isci_host = devm_kzalloc(&pdev->dev, sizeof(*isci_host) + 399 isci_host = devm_kzalloc(&pdev->dev, sizeof(*isci_host), GFP_KERNEL);
400 SCI_MAX_REMOTE_DEVICES *
401 (sizeof(struct isci_remote_device) +
402 scic_remote_device_get_object_size()), GFP_KERNEL);
403 if (!isci_host) 400 if (!isci_host)
404 return NULL; 401 return NULL;
405 402