iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: hptiop: Stop using the SCSI pointer

Browse Source 
Set .cmd_size in the SCSI host template instead of using the SCSI pointer
from struct scsi_cmnd. This patch prepares for removal of the SCSI pointer
from struct scsi_cmnd.

Rename hpt_scsi_pointer into hpt_cmd_priv because that data structure is
not related to struct scsi_pointer.

Link: https://lore.kernel.org/r/20220218195117.25689-24-bvanassche@acm.org
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Bart Van Assche 2022-02-18 11:50:51 -08:00 committed by Martin K. Petersen
parent 924cb24df4
commit 5c113eb3bc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/scsi/hptiop.c
View File

@ -1174,6 +1174,7 @@ static struct scsi_host_template driver_template = {
.slave_configure = hptiop_slave_config, .slave_configure = hptiop_slave_config,
.this_id = -1, .this_id = -1,
.change_queue_depth = hptiop_adjust_disk_queue_depth, .change_queue_depth = hptiop_adjust_disk_queue_depth,
.cmd_size = sizeof(struct hpt_cmd_priv),
}; };
static int hptiop_internal_memalloc_itl(struct hptiop_hba *hba) static int hptiop_internal_memalloc_itl(struct hptiop_hba *hba)

4
drivers/scsi/hptiop.h
View File

@ -251,13 +251,13 @@ struct hptiop_request {
int index; int index;
}; };
struct hpt_scsi_pointer { struct hpt_cmd_priv {
int mapped; int mapped;
int sgcnt; int sgcnt;
dma_addr_t dma_handle; dma_addr_t dma_handle;
}; };
#define HPT_SCP(scp) ((struct hpt_scsi_pointer *)&(scp)->SCp) #define HPT_SCP(scp) ((struct hpt_cmd_priv *)scsi_cmd_priv(scp))
enum hptiop_family { enum hptiop_family {
UNKNOWN_BASED_IOP, UNKNOWN_BASED_IOP,