Commit 1a2fbf18 authored by Joe Lawrence's avatar Joe Lawrence Committed by Christoph Hellwig

qla2xxx: Use qla2x00_clear_drv_active on probe failure

Take advantage of commit fe1b806f ("qla2xxx: Refactor shutdown code
so some functionality can be reused") to remove an inlined copy of
qla2x00_clear_drv_active in the driver's probe hardware error path.
Signed-off-by: default avatarJoe Lawrence <joe.lawrence@stratus.com>
Acked-by: default avatarChad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent db7157d4
...@@ -238,6 +238,7 @@ static int qla2xxx_eh_host_reset(struct scsi_cmnd *); ...@@ -238,6 +238,7 @@ static int qla2xxx_eh_host_reset(struct scsi_cmnd *);
static int qla2x00_change_queue_depth(struct scsi_device *, int, int); static int qla2x00_change_queue_depth(struct scsi_device *, int, int);
static int qla2x00_change_queue_type(struct scsi_device *, int); static int qla2x00_change_queue_type(struct scsi_device *, int);
static void qla2x00_clear_drv_active(struct qla_hw_data *);
static void qla2x00_free_device(scsi_qla_host_t *); static void qla2x00_free_device(scsi_qla_host_t *);
struct scsi_host_template qla2xxx_driver_template = { struct scsi_host_template qla2xxx_driver_template = {
...@@ -2954,16 +2955,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -2954,16 +2955,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
scsi_host_put(base_vha->host); scsi_host_put(base_vha->host);
probe_hw_failed: probe_hw_failed:
if (IS_QLA82XX(ha)) { qla2x00_clear_drv_active(ha);
qla82xx_idc_lock(ha);
qla82xx_clear_drv_active(ha);
qla82xx_idc_unlock(ha);
}
if (IS_QLA8044(ha)) {
qla8044_idc_lock(ha);
qla8044_clear_drv_active(ha);
qla8044_idc_unlock(ha);
}
iospace_config_failed: iospace_config_failed:
if (IS_P3P_TYPE(ha)) { if (IS_P3P_TYPE(ha)) {
if (!ha->nx_pcibase) if (!ha->nx_pcibase)
......
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