Message ID | 20200206135443.110701-1-dwagner@suse.de (mailing list archive) |
---|---|
State | Mainlined |
Commit | 1b72e86ddbbc7fb55771bf649d81c2513830a6a5 |
Headers | show |
Series | qla2xxx: Remove non functional code | expand |
On 2/6/20 5:54 AM, Daniel Wagner wrote: > Remove code which has no functional use anymore since > 3c75ad1d87c7 ("scsi: qla2xxx: Remove defer flag to indicate immeadiate > port loss"). > > While at it remove also the stale function documentation. > > Signed-off-by: Daniel Wagner <dwagner@suse.de> > --- > drivers/scsi/qla2xxx/qla_os.c | 23 ----------------------- > 1 file changed, 23 deletions(-) > > diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c > index 79387ac8936f..27a5d0c7e246 100644 > --- a/drivers/scsi/qla2xxx/qla_os.c > +++ b/drivers/scsi/qla2xxx/qla_os.c > @@ -3909,19 +3909,6 @@ void qla2x00_mark_device_lost(scsi_qla_host_t *vha, fc_port_t *fcport, > set_bit(RELOGIN_NEEDED, &vha->dpc_flags); > } > > -/* > - * qla2x00_mark_all_devices_lost > - * Updates fcport state when device goes offline. > - * > - * Input: > - * ha = adapter block pointer. > - * fcport = port structure pointer. > - * > - * Return: > - * None. > - * > - * Context: > - */ > void > qla2x00_mark_all_devices_lost(scsi_qla_host_t *vha) > { > @@ -3933,16 +3920,6 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *vha) > list_for_each_entry(fcport, &vha->vp_fcports, list) { > fcport->scan_state = 0; > qlt_schedule_sess_for_deletion(fcport); > - > - if (vha->vp_idx != 0 && vha->vp_idx != fcport->vha->vp_idx) > - continue; > - > - /* > - * No point in marking the device as lost, if the device is > - * already DEAD. > - */ > - if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD) > - continue; > } > } > > Reviewed-by: Lee Duncan <lduncan@suse.com>
On Thu, 6 Feb 2020, 5:54am, Daniel Wagner wrote: > Remove code which has no functional use anymore since > 3c75ad1d87c7 ("scsi: qla2xxx: Remove defer flag to indicate immeadiate > port loss"). > > While at it remove also the stale function documentation. > > Signed-off-by: Daniel Wagner <dwagner@suse.de> > --- > drivers/scsi/qla2xxx/qla_os.c | 23 ----------------------- > 1 file changed, 23 deletions(-) > > diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c > index 79387ac8936f..27a5d0c7e246 100644 > --- a/drivers/scsi/qla2xxx/qla_os.c > +++ b/drivers/scsi/qla2xxx/qla_os.c > @@ -3909,19 +3909,6 @@ void qla2x00_mark_device_lost(scsi_qla_host_t *vha, fc_port_t *fcport, > set_bit(RELOGIN_NEEDED, &vha->dpc_flags); > } > > -/* > - * qla2x00_mark_all_devices_lost > - * Updates fcport state when device goes offline. > - * > - * Input: > - * ha = adapter block pointer. > - * fcport = port structure pointer. > - * > - * Return: > - * None. > - * > - * Context: > - */ > void > qla2x00_mark_all_devices_lost(scsi_qla_host_t *vha) > { > @@ -3933,16 +3920,6 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *vha) > list_for_each_entry(fcport, &vha->vp_fcports, list) { > fcport->scan_state = 0; > qlt_schedule_sess_for_deletion(fcport); > - > - if (vha->vp_idx != 0 && vha->vp_idx != fcport->vha->vp_idx) > - continue; > - > - /* > - * No point in marking the device as lost, if the device is > - * already DEAD. > - */ > - if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD) > - continue; > } > } > > Looks good. Thanks Daniel. Reviewed-by: Arun Easi <aeasi@marvell.com>
Daniel, > Remove code which has no functional use anymore since 3c75ad1d87c7 > ("scsi: qla2xxx: Remove defer flag to indicate immeadiate port loss"). Applied to 5.7/scsi-queue, thanks!
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 79387ac8936f..27a5d0c7e246 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -3909,19 +3909,6 @@ void qla2x00_mark_device_lost(scsi_qla_host_t *vha, fc_port_t *fcport, set_bit(RELOGIN_NEEDED, &vha->dpc_flags); } -/* - * qla2x00_mark_all_devices_lost - * Updates fcport state when device goes offline. - * - * Input: - * ha = adapter block pointer. - * fcport = port structure pointer. - * - * Return: - * None. - * - * Context: - */ void qla2x00_mark_all_devices_lost(scsi_qla_host_t *vha) { @@ -3933,16 +3920,6 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *vha) list_for_each_entry(fcport, &vha->vp_fcports, list) { fcport->scan_state = 0; qlt_schedule_sess_for_deletion(fcport); - - if (vha->vp_idx != 0 && vha->vp_idx != fcport->vha->vp_idx) - continue; - - /* - * No point in marking the device as lost, if the device is - * already DEAD. - */ - if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD) - continue; } }
Remove code which has no functional use anymore since 3c75ad1d87c7 ("scsi: qla2xxx: Remove defer flag to indicate immeadiate port loss"). While at it remove also the stale function documentation. Signed-off-by: Daniel Wagner <dwagner@suse.de> --- drivers/scsi/qla2xxx/qla_os.c | 23 ----------------------- 1 file changed, 23 deletions(-)