Commit 50b7f5a2 authored by Shivasharan S's avatar Shivasharan S Committed by Martin K. Petersen
Browse files

scsi: megaraid_sas: Change max_cmd from u32 to u16 in all functions 



Since maximum supported FW commands are all defined as u16, change
all local variables referring to max_cmd from u32 to u16.

Signed-off-by: default avatarKashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: default avatarShivasharan S <shivasharan.srikanteshwara@broadcom.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b41c0a4a

drivers/scsi/megaraid/megaraid_sas_base.c

+5 −5
Original line number Diff line number Diff line
@@ -1549,7 +1549,7 @@ megasas_dump_pending_frames(struct megasas_instance *instance) 
	struct megasas_io_frame *ldio;

	struct megasas_pthru_frame *pthru;

	u32 sgcount;

	u32 max_cmd = instance->max_fw_cmds;

	u16 max_cmd = instance->max_fw_cmds;



	dev_err(&instance->pdev->dev, "[%d]: Dumping Frame Phys Address of all pending cmds in FW\n",instance->host->host_no);

	dev_err(&instance->pdev->dev, "[%d]: Total OS Pending cmds : %d\n",instance->host->host_no,atomic_read(&instance->fw_outstanding));
@@ -3467,7 +3467,7 @@ megasas_internal_reset_defer_cmds(struct megasas_instance *instance) 
{

	struct megasas_cmd *cmd;

	int i;

	u32 max_cmd = instance->max_fw_cmds;

	u16 max_cmd = instance->max_fw_cmds;

	u32 defer_index;

	unsigned long flags;
@@ -3843,7 +3843,7 @@ megasas_transition_to_ready(struct megasas_instance *instance, int ocr) 
static void megasas_teardown_frame_pool(struct megasas_instance *instance)

{

	int i;

	u32 max_cmd = instance->max_mfi_cmds;

	u16 max_cmd = instance->max_mfi_cmds;

	struct megasas_cmd *cmd;



	if (!instance->frame_dma_pool)
@@ -3887,7 +3887,7 @@ static void megasas_teardown_frame_pool(struct megasas_instance *instance) 
static int megasas_create_frame_pool(struct megasas_instance *instance)

{

	int i;

	u32 max_cmd;

	u16 max_cmd;

	u32 sge_sz;

	u32 total_sz;

	u32 frame_count;
@@ -4021,7 +4021,7 @@ int megasas_alloc_cmds(struct megasas_instance *instance) 
{

	int i;

	int j;

	u32 max_cmd;

	u16 max_cmd;

	struct megasas_cmd *cmd;

	struct fusion_context *fusion;

drivers/scsi/megaraid/megaraid_sas_fusion.c

+3 −2
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ megasas_free_cmds_fusion(struct megasas_instance *instance) 
static int megasas_create_sg_sense_fusion(struct megasas_instance *instance)

{

	int i;

	u32 max_cmd;

	u16 max_cmd;

	struct fusion_context *fusion;

	struct megasas_cmd_fusion *cmd;
@@ -1274,7 +1274,8 @@ megasas_init_adapter_fusion(struct megasas_instance *instance) 
{

	struct megasas_register_set __iomem *reg_set;

	struct fusion_context *fusion;

	u32 max_cmd, scratch_pad_2;

	u16 max_cmd;

	u32 scratch_pad_2;

	int i = 0, count;



	fusion = instance->ctrl_context;

CRA Git | Maintained and supported by SUSTech CRA and CCSE