Commit 096ccff4 authored by Kevin Barnett's avatar Kevin Barnett Committed by Martin K. Petersen

hpsa: move scsi_add_device and scsi_remove_device calls to new function

preparation for adding the sas transport class
Reviewed-by: default avatarScott Teel <scott.teel@pmcs.com>
Reviewed-by: default avatarJustin Lindley <justin.lindley@pmcs.com>
Reviewed-by: default avatarKevin Barnett <kevin.barnett@pmcs.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarMatthew R. Ochs <mrochs@linux.vnet.ibm.com>
Signed-off-by: default avatarDon Brace <don.brace@pmcs.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c795505a
...@@ -1653,6 +1653,43 @@ static void hpsa_update_log_drive_phys_drive_ptrs(struct ctlr_info *h, ...@@ -1653,6 +1653,43 @@ static void hpsa_update_log_drive_phys_drive_ptrs(struct ctlr_info *h,
} }
} }
static int hpsa_add_device(struct ctlr_info *h, struct hpsa_scsi_dev_t *device)
{
int rc = 0;
if (!h->scsi_host)
return 1;
rc = scsi_add_device(h->scsi_host, device->bus,
device->target, device->lun);
return rc;
}
static void hpsa_remove_device(struct ctlr_info *h,
struct hpsa_scsi_dev_t *device)
{
struct scsi_device *sdev = NULL;
if (!h->scsi_host)
return;
sdev = scsi_device_lookup(h->scsi_host, device->bus,
device->target, device->lun);
if (sdev) {
scsi_remove_device(sdev);
scsi_device_put(sdev);
} else {
/*
* We don't expect to get here. Future commands
* to this device will get a selection timeout as
* if the device were gone.
*/
hpsa_show_dev_msg(KERN_WARNING, h, device,
"didn't find device for removal.");
}
}
static void adjust_hpsa_scsi_table(struct ctlr_info *h, static void adjust_hpsa_scsi_table(struct ctlr_info *h,
struct hpsa_scsi_dev_t *sd[], int nsds) struct hpsa_scsi_dev_t *sd[], int nsds)
{ {
...@@ -1665,7 +1702,6 @@ static void adjust_hpsa_scsi_table(struct ctlr_info *h, ...@@ -1665,7 +1702,6 @@ static void adjust_hpsa_scsi_table(struct ctlr_info *h,
unsigned long flags; unsigned long flags;
struct hpsa_scsi_dev_t **added, **removed; struct hpsa_scsi_dev_t **added, **removed;
int nadded, nremoved; int nadded, nremoved;
struct Scsi_Host *sh = NULL;
/* /*
* A reset can cause a device status to change * A reset can cause a device status to change
...@@ -1783,46 +1819,29 @@ static void adjust_hpsa_scsi_table(struct ctlr_info *h, ...@@ -1783,46 +1819,29 @@ static void adjust_hpsa_scsi_table(struct ctlr_info *h,
if (!changes) if (!changes)
goto free_and_out; goto free_and_out;
sh = h->scsi_host;
if (sh == NULL) {
dev_warn(&h->pdev->dev, "%s: scsi_host is null\n", __func__);
goto free_and_out;
}
/* Notify scsi mid layer of any removed devices */ /* Notify scsi mid layer of any removed devices */
for (i = 0; i < nremoved; i++) { for (i = 0; i < nremoved; i++) {
if (removed[i] == NULL) if (removed[i] == NULL)
continue; continue;
if (removed[i]->expose_device) { if (removed[i]->expose_device)
struct scsi_device *sdev = hpsa_remove_device(h, removed[i]);
scsi_device_lookup(sh, removed[i]->bus,
removed[i]->target, removed[i]->lun);
if (sdev != NULL) {
scsi_remove_device(sdev);
scsi_device_put(sdev);
} else {
/*
* We don't expect to get here.
* future cmds to this device will get selection
* timeout as if the device was gone.
*/
hpsa_show_dev_msg(KERN_WARNING, h, removed[i],
"didn't find device for removal.");
}
}
kfree(removed[i]); kfree(removed[i]);
removed[i] = NULL; removed[i] = NULL;
} }
/* Notify scsi mid layer of any added devices */ /* Notify scsi mid layer of any added devices */
for (i = 0; i < nadded; i++) { for (i = 0; i < nadded; i++) {
int rc = 0;
if (added[i] == NULL) if (added[i] == NULL)
continue; continue;
if (!(added[i]->expose_device)) if (!(added[i]->expose_device))
continue; continue;
if (scsi_add_device(sh, added[i]->bus, rc = hpsa_add_device(h, added[i]);
added[i]->target, added[i]->lun) == 0) if (!rc)
continue; continue;
dev_warn(&h->pdev->dev, "addition failed, device not added."); dev_warn(&h->pdev->dev,
"addition failed %d, device not added.", rc);
/* now we have to remove it from h->dev, /* now we have to remove it from h->dev,
* since it didn't get added to scsi mid layer * since it didn't get added to scsi mid layer
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment