5.15-stable review patch. If anyone has any objections, please let me know. ------------------ This reverts commit 3285f3a01085e815a2e2a6b72dcffbb037a62553. Signed-off-by: Sasha Levin --- drivers/scsi/smartpqi/smartpqi_init.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index 7ecc62fc572aa..1df17ef2ec93a 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -54,15 +54,6 @@ MODULE_DESCRIPTION("Driver for Microchip Smart Family Controller version " MODULE_VERSION(DRIVER_VERSION); MODULE_LICENSE("GPL"); -struct pqi_cmd_priv { - int this_residual; -}; - -static struct pqi_cmd_priv *pqi_cmd_priv(struct scsi_cmnd *cmd) -{ - return scsi_cmd_priv(cmd); -} - 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); @@ -5399,7 +5390,7 @@ static void pqi_aio_io_complete(struct pqi_io_request *io_request, scsi_dma_unmap(scmd); if (io_request->status == -EAGAIN || pqi_raid_bypass_retry_needed(io_request)) { set_host_byte(scmd, DID_IMM_RETRY); - pqi_cmd_priv(scmd)->this_residual++; + scmd->SCp.this_residual++; } pqi_free_io_request(io_request); @@ -5623,7 +5614,7 @@ static inline bool pqi_is_bypass_eligible_request(struct scsi_cmnd *scmd) if (blk_rq_is_passthrough(scsi_cmd_to_rq(scmd))) return false; - return pqi_cmd_priv(scmd)->this_residual == 0; + return scmd->SCp.this_residual == 0; } /* @@ -6989,7 +6980,6 @@ static struct scsi_host_template pqi_driver_template = { .map_queues = pqi_map_queues, .sdev_groups = pqi_sdev_groups, .shost_groups = pqi_shost_groups, - .cmd_size = sizeof(struct pqi_cmd_priv), }; static int pqi_register_scsi(struct pqi_ctrl_info *ctrl_info) -- 2.53.0