Commit 41064f1b authored by Shivasharan S's avatar Shivasharan S Committed by Martin K. Petersen
Browse files

scsi: megaraid_sas: Indentation and smatch warning fixes 

Fix indentation issues and smatch warning reported by Dan Carpenter
for previous series as discussed below.
http://www.spinics.net/lists/linux-scsi/msg103635.html
http://www.spinics.net/lists/linux-scsi/msg103603.html



Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarKashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: default avatarSasikumar Chandrasekaran <sasikumar.pc@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 e00731bc

drivers/scsi/megaraid/megaraid_sas_base.c

+5 −5
Original line number Diff line number Diff line
@@ -5343,7 +5343,7 @@ static int megasas_init_fw(struct megasas_instance *instance) 
	memset(instance->ld_ids, 0xff, MEGASAS_MAX_LD_IDS);



	/* stream detection initialization */

	if (instance->is_ventura) {

	if (instance->is_ventura && fusion) {

		fusion->stream_detect_by_ld =

			kzalloc(sizeof(struct LD_STREAM_DETECT *)

			* MAX_LOGICAL_DRIVES_EXT,

drivers/scsi/megaraid/megaraid_sas_fp.c

+30 −27
Original line number Diff line number Diff line
@@ -243,15 +243,18 @@ void MR_PopulateDrvRaidMap(struct megasas_instance *instance) 
					(raid_map_data + le32_to_cpu(desc_table->raid_map_desc_offset));

				memcpy(pDrvRaidMap->arMapInfo,

				       fw_map_dyn->ar_map_info,

				sizeof(struct MR_ARRAY_INFO) * le32_to_cpu(desc_table->raid_map_desc_elements));

				       sizeof(struct MR_ARRAY_INFO) *

				       le32_to_cpu(desc_table->raid_map_desc_elements));

			break;

			case RAID_MAP_DESC_TYPE_SPAN_INFO:

				fw_map_dyn->ld_span_map =

					(struct MR_LD_SPAN_MAP *)

				(raid_map_data + le32_to_cpu(desc_table->raid_map_desc_offset));

					(raid_map_data +

					le32_to_cpu(desc_table->raid_map_desc_offset));

				memcpy(pDrvRaidMap->ldSpanMap,

				       fw_map_dyn->ld_span_map,

				sizeof(struct MR_LD_SPAN_MAP) * le32_to_cpu(desc_table->raid_map_desc_elements));

				       sizeof(struct MR_LD_SPAN_MAP) *

				       le32_to_cpu(desc_table->raid_map_desc_elements));

			break;

			default:

				dev_dbg(&instance->pdev->dev, "wrong number of desctableElements %d\n",

drivers/scsi/megaraid/megaraid_sas_fusion.c

+43 −49
Original line number Diff line number Diff line
@@ -446,8 +446,6 @@ megasas_alloc_cmdlist_fusion(struct megasas_instance *instance) 
		return -ENOMEM;

	}







	for (i = 0; i < max_mpt_cmd; i++) {

		fusion->cmd_list[i] = kzalloc(sizeof(struct megasas_cmd_fusion),

					      GFP_KERNEL);
@@ -2048,8 +2046,8 @@ static void megasas_stream_detect(struct megasas_instance *instance, 
	struct STREAM_DETECT *current_sd;

	/* find possible stream */

	for (i = 0; i < MAX_STREAMS_TRACKED; ++i) {

		stream_num =

		(*track_stream >> (i * BITS_PER_INDEX_STREAM)) &

		stream_num = (*track_stream >>

			(i * BITS_PER_INDEX_STREAM)) &

			STREAM_MASK;

		current_sd = &current_ld_sd->stream_track[stream_num];

		/* if we found a stream, update the raid
@@ -2061,8 +2059,8 @@ static void megasas_stream_detect(struct megasas_instance *instance, 
		    (io_info->ldStartBlock <= (current_sd->next_seq_lba + 32)) &&

		    (current_sd->is_read == io_info->isRead)) {



		if ((io_info->ldStartBlock != current_sd->next_seq_lba)

			&& ((!io_info->isRead) || (!is_read_ahead)))

			if ((io_info->ldStartBlock != current_sd->next_seq_lba)	&&

			    ((!io_info->isRead) || (!is_read_ahead)))

				/*

				 * Once the API availible we need to change this.

				 * At this point we are not allowing any gap
@@ -2087,24 +2085,20 @@ static void megasas_stream_detect(struct megasas_instance *instance, 
			*track_stream =

				unshifted_values | shifted_values | stream_num;

			return;



		}



	}

	/*

	 * if we did not find any stream, create a new one

	 * from the least recently used

	 */

	stream_num =

	(*track_stream >> ((MAX_STREAMS_TRACKED - 1) * BITS_PER_INDEX_STREAM)) &

	stream_num = (*track_stream >>

		((MAX_STREAMS_TRACKED - 1) * BITS_PER_INDEX_STREAM)) &

		STREAM_MASK;

	current_sd = &current_ld_sd->stream_track[stream_num];

	current_sd->is_read = io_info->isRead;

	current_sd->next_seq_lba = io_info->ldStartBlock + io_info->numBlocks;

	*track_stream =

	(((*track_stream & ZERO_LAST_STREAM) << 4) | stream_num);

	*track_stream = (((*track_stream & ZERO_LAST_STREAM) << 4) | stream_num);

	return;



}



/**

drivers/scsi/megaraid/megaraid_sas.h

+1 −1

File changed.

Contains only whitespace changes.

drivers/scsi/megaraid/megaraid_sas_fusion.h

+1 −1

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE