Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a232bb3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley
Browse files

megaraid_sas : add missing __iomem annotations 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSumit Saxena <sumit.saxena@avagotech.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent 6a6981fe

drivers/scsi/megaraid/megaraid_sas.h

+1 −1
Original line number Diff line number Diff line
@@ -1693,7 +1693,7 @@ struct megasas_instance { 
	spinlock_t crashdump_lock;



	struct megasas_register_set __iomem *reg_set;

	u32 *reply_post_host_index_addr[MR_MAX_MSIX_REG_ARRAY];

	u32 __iomem *reply_post_host_index_addr[MR_MAX_MSIX_REG_ARRAY];

	struct megasas_pd_list          pd_list[MEGASAS_MAX_PD];

	struct megasas_pd_list          local_pd_list[MEGASAS_MAX_PD];

	u8 ld_ids[MEGASAS_MAX_LD_IDS];

drivers/scsi/megaraid/megaraid_sas_base.c

+5 −4
Original line number Diff line number Diff line
@@ -802,8 +802,8 @@ megasas_adp_reset_gen2(struct megasas_instance *instance, 
{

	u32			retry = 0 ;

	u32			HostDiag;

	u32			*seq_offset = &reg_set->seq_offset;

	u32			*hostdiag_offset = &reg_set->host_diag;

	u32 __iomem		*seq_offset = &reg_set->seq_offset;

	u32 __iomem		*hostdiag_offset = &reg_set->host_diag;



	if (instance->instancet == &megasas_instance_template_skinny) {

		seq_offset = &reg_set->fusion_seq_offset;
@@ -4575,7 +4575,7 @@ static int megasas_init_fw(struct megasas_instance *instance) 
	 * It is used for all MPT based Adapters.

	 */

	instance->reply_post_host_index_addr[0] =

		(u32 *)((u8 *)instance->reg_set +

		(u32 __iomem *)((u8 __iomem *)instance->reg_set +

		MPI2_REPLY_POST_HOST_INDEX_OFFSET);



	/* Check if MSI-X is supported while in ready state */
@@ -4607,7 +4607,8 @@ static int megasas_init_fw(struct megasas_instance *instance) 
			 */

			for (loop = 1; loop < MR_MAX_MSIX_REG_ARRAY; loop++) {

				instance->reply_post_host_index_addr[loop] =

					(u32 *)((u8 *)instance->reg_set +

					(u32 __iomem *)

					((u8 __iomem *)instance->reg_set +

					MPI2_SUP_REPLY_POST_HOST_INDEX_OFFSET

					+ (loop * 0x10));

			}