Skip to content

Commit 0854065

Browse files
Ranjan Kumarmartinkpetersen
Ranjan Kumar
authored andcommitted
scsi: mpt3sas: Remove volatile qualifier
Remove reduntant volatile qualifier. Signed-off-by: Ranjan Kumar <ranjan.kumar@broadcom.com> Link: https://lore.kernel.org/r/20230829090020.5417-3-ranjan.kumar@broadcom.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 4ca10f3 commit 0854065

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

drivers/scsi/mpt3sas/mpi/mpi2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
*
200200
*****************************************************************************/
201201

202-
typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS {
202+
typedef struct _MPI2_SYSTEM_INTERFACE_REGS {
203203
U32 Doorbell; /*0x00 */
204204
U32 WriteSequence; /*0x04 */
205205
U32 HostDiagnostic; /*0x08 */

drivers/scsi/mpt3sas/mpt3sas_base.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ static void
139139
_base_clear_outstanding_commands(struct MPT3SAS_ADAPTER *ioc);
140140

141141
static u32
142-
_base_readl_ext_retry(const volatile void __iomem *addr);
142+
_base_readl_ext_retry(const void __iomem *addr);
143143

144144
/**
145145
* mpt3sas_base_check_cmd_timeout - Function
@@ -204,7 +204,7 @@ module_param_call(mpt3sas_fwfault_debug, _scsih_set_fwfault_debug,
204204
* while reading the system interface register.
205205
*/
206206
static inline u32
207-
_base_readl_aero(const volatile void __iomem *addr)
207+
_base_readl_aero(const void __iomem *addr)
208208
{
209209
u32 i = 0, ret_val;
210210

@@ -217,7 +217,7 @@ _base_readl_aero(const volatile void __iomem *addr)
217217
}
218218

219219
static u32
220-
_base_readl_ext_retry(const volatile void __iomem *addr)
220+
_base_readl_ext_retry(const void __iomem *addr)
221221
{
222222
u32 i, ret_val;
223223

@@ -231,7 +231,7 @@ _base_readl_ext_retry(const volatile void __iomem *addr)
231231
}
232232

233233
static inline u32
234-
_base_readl(const volatile void __iomem *addr)
234+
_base_readl(const void __iomem *addr)
235235
{
236236
return readl(addr);
237237
}

drivers/scsi/mpt3sas/mpt3sas_base.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@ typedef void (*NVME_BUILD_PRP)(struct MPT3SAS_ADAPTER *ioc, u16 smid,
994994
typedef void (*PUT_SMID_IO_FP_HIP) (struct MPT3SAS_ADAPTER *ioc, u16 smid,
995995
u16 funcdep);
996996
typedef void (*PUT_SMID_DEFAULT) (struct MPT3SAS_ADAPTER *ioc, u16 smid);
997-
typedef u32 (*BASE_READ_REG) (const volatile void __iomem *addr);
997+
typedef u32 (*BASE_READ_REG) (const void __iomem *addr);
998998
/*
999999
* To get high iops reply queue's msix index when high iops mode is enabled
10001000
* else get the msix index of general reply queues.

0 commit comments

Comments
 (0)