5.15-stable review patch. If anyone has any objections, please let me know. ------------------ This reverts commit 9349b8c77be9d50625d12b58dca4ee2b91f12017. Signed-off-by: Sasha Levin --- drivers/scsi/smartpqi/smartpqi_init.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index 05ea8bea81841..7ecc62fc572aa 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -63,12 +63,6 @@ static struct pqi_cmd_priv *pqi_cmd_priv(struct scsi_cmnd *cmd) return scsi_cmd_priv(cmd); } -static int pqi_init_cmd_priv(struct Scsi_Host *shost, struct scsi_cmnd *cmd) -{ - memset(pqi_cmd_priv(cmd), 0, sizeof(struct pqi_cmd_priv)); - return 0; -} - static void pqi_verify_structures(void); static void pqi_take_ctrl_offline(struct pqi_ctrl_info *ctrl_info, enum pqi_ctrl_shutdown_reason ctrl_shutdown_reason); @@ -5641,17 +5635,6 @@ void pqi_prep_for_scsi_done(struct scsi_cmnd *scmd) { struct pqi_scsi_dev *device; - /* - * Clear the AIO-retry marker on final completion so the tag - * starts clean on its next dispatch. On DID_IMM_RETRY leave - * it intact: pqi_aio_io_complete() sets DID_IMM_RETRY and - * bumps the marker to steer the requeue onto the RAID path, - * and pqi_process_raid_io_error() consumes the non-zero - * marker to offline a misbehaving drive. - */ - if (host_byte(scmd->result) != DID_IMM_RETRY) - pqi_cmd_priv(scmd)->this_residual = 0; - if (!scmd->device) { set_host_byte(scmd, DID_NO_CONNECT); return; @@ -7007,7 +6990,6 @@ static struct scsi_host_template pqi_driver_template = { .sdev_groups = pqi_sdev_groups, .shost_groups = pqi_shost_groups, .cmd_size = sizeof(struct pqi_cmd_priv), - .init_cmd_priv = pqi_init_cmd_priv, }; static int pqi_register_scsi(struct pqi_ctrl_info *ctrl_info) -- 2.53.0