* [PATCH v1 1/8] scsi: megaraid: clean up for white space
2021-04-10 6:47 [PATCH v1 0/8] scsi: megaraid: some misc clean up patches Luo Jiaxing
@ 2021-04-10 6:48 ` Luo Jiaxing
2021-04-10 6:48 ` [PATCH v1 2/8] scsi: megaraid_sas: use parentheses to enclose macros with complex values Luo Jiaxing
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Luo Jiaxing @ 2021-04-10 6:48 UTC (permalink / raw)
To: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara, jejb,
martin.petersen
Cc: megaraidlinux.pdl, linux-scsi, linux-kernel, linuxarm, luojiaxing
Several kinds of error about white space is reported when running
checkpatch.pl:
ERROR: space required after that ',' (ctx:VxV)
+ "commands to complete\n",i,outstanding);
ERROR: trailing whitespace
+^I^I^Idma_pool_free(pool->handle, kioc->buf_vaddr, $
ERROR: need consistent spacing around '*' (ctx:WxV)
+ u32 reply_q_sz = sizeof(u32) *(instance->max_mfi_cmds + 1);
so fix them together here.
Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
---
drivers/scsi/megaraid/mbox_defs.h | 20 +++++++++----------
drivers/scsi/megaraid/megaraid_ioctl.h | 4 ++--
drivers/scsi/megaraid/megaraid_mbox.c | 24 +++++++++++-----------
drivers/scsi/megaraid/megaraid_mm.c | 26 ++++++++++++------------
drivers/scsi/megaraid/megaraid_sas_base.c | 33 ++++++++++++++++++++-----------
5 files changed, 58 insertions(+), 49 deletions(-)
diff --git a/drivers/scsi/megaraid/mbox_defs.h b/drivers/scsi/megaraid/mbox_defs.h
index f0ef8f7..5001624 100644
--- a/drivers/scsi/megaraid/mbox_defs.h
+++ b/drivers/scsi/megaraid/mbox_defs.h
@@ -588,7 +588,7 @@ typedef struct {
typedef struct {
uint8_t channel;
uint8_t target;
-}__attribute__ ((packed)) adap_device_t;
+} __attribute__ ((packed)) adap_device_t;
/**
@@ -600,7 +600,7 @@ typedef struct {
uint32_t start_blk;
uint32_t num_blks;
adap_device_t device[MAX_ROW_SIZE_40LD];
-}__attribute__ ((packed)) adap_span_40ld_t;
+} __attribute__ ((packed)) adap_span_40ld_t;
/**
@@ -612,7 +612,7 @@ typedef struct {
uint32_t start_blk;
uint32_t num_blks;
adap_device_t device[MAX_ROW_SIZE_8LD];
-}__attribute__ ((packed)) adap_span_8ld_t;
+} __attribute__ ((packed)) adap_span_8ld_t;
/**
@@ -647,7 +647,7 @@ typedef struct {
typedef struct {
logdrv_param_t lparam;
adap_span_40ld_t span[SPAN_DEPTH_8_SPANS];
-}__attribute__ ((packed)) logdrv_40ld_t;
+} __attribute__ ((packed)) logdrv_40ld_t;
/**
@@ -660,7 +660,7 @@ typedef struct {
typedef struct {
logdrv_param_t lparam;
adap_span_8ld_t span[SPAN_DEPTH_8_SPANS];
-}__attribute__ ((packed)) logdrv_8ld_span8_t;
+} __attribute__ ((packed)) logdrv_8ld_span8_t;
/**
@@ -673,7 +673,7 @@ typedef struct {
typedef struct {
logdrv_param_t lparam;
adap_span_8ld_t span[SPAN_DEPTH_4_SPANS];
-}__attribute__ ((packed)) logdrv_8ld_span4_t;
+} __attribute__ ((packed)) logdrv_8ld_span4_t;
/**
@@ -690,7 +690,7 @@ typedef struct {
uint8_t tag_depth;
uint8_t sync_neg;
uint32_t size;
-}__attribute__ ((packed)) phys_drive_t;
+} __attribute__ ((packed)) phys_drive_t;
/**
@@ -705,7 +705,7 @@ typedef struct {
uint8_t resvd[3];
logdrv_40ld_t ldrv[MAX_LOGICAL_DRIVES_40LD];
phys_drive_t pdrv[MBOX_MAX_PHYSICAL_DRIVES];
-}__attribute__ ((packed)) disk_array_40ld_t;
+} __attribute__ ((packed)) disk_array_40ld_t;
/**
@@ -722,7 +722,7 @@ typedef struct {
uint8_t resvd[3];
logdrv_8ld_span8_t ldrv[MAX_LOGICAL_DRIVES_8LD];
phys_drive_t pdrv[MBOX_MAX_PHYSICAL_DRIVES];
-}__attribute__ ((packed)) disk_array_8ld_span8_t;
+} __attribute__ ((packed)) disk_array_8ld_span8_t;
/**
@@ -739,7 +739,7 @@ typedef struct {
uint8_t resvd[3];
logdrv_8ld_span4_t ldrv[MAX_LOGICAL_DRIVES_8LD];
phys_drive_t pdrv[MBOX_MAX_PHYSICAL_DRIVES];
-}__attribute__ ((packed)) disk_array_8ld_span4_t;
+} __attribute__ ((packed)) disk_array_8ld_span4_t;
/**
diff --git a/drivers/scsi/megaraid/megaraid_ioctl.h b/drivers/scsi/megaraid/megaraid_ioctl.h
index ae9c2ff..d0ae6f9 100644
--- a/drivers/scsi/megaraid/megaraid_ioctl.h
+++ b/drivers/scsi/megaraid/megaraid_ioctl.h
@@ -76,7 +76,7 @@
#define DRVRTYPE_MBOX 0x00000001 /* regular mbox driver */
#define DRVRTYPE_HPE 0x00000002 /* new hpe driver */
-#define MKADAP(adapno) (MEGAIOC_MAGIC << 8 | (adapno) )
+#define MKADAP(adapno) (MEGAIOC_MAGIC << 8 | (adapno))
#define GETADAP(mkadap) ((mkadap) ^ MEGAIOC_MAGIC << 8)
#define MAX_DMA_POOLS 5 /* 4k, 8k, 16k, 32k, 64k*/
@@ -148,7 +148,7 @@ typedef struct uioc {
uint8_t timedout;
-} __attribute__ ((aligned(1024),packed)) uioc_t;
+} __attribute__ ((aligned(1024), packed)) uioc_t;
/* For on-stack uioc timers. */
struct uioc_timeout {
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 145fde3..6d76b15 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -736,7 +736,7 @@ megaraid_init_mbox(adapter_t *adapter)
if (!raid_dev->baseaddr) {
con_log(CL_ANN, (KERN_WARNING
- "megaraid: could not map hba memory\n") );
+ "megaraid: could not map hba memory\n"));
goto out_release_regions;
}
@@ -1396,7 +1396,7 @@ mbox_post_cmd(adapter_t *adapter, scb_t *scb)
udelay(1);
i++;
rmb();
- } while(mbox->busy && (i < max_mbox_busy_wait));
+ } while (mbox->busy && (i < max_mbox_busy_wait));
if (mbox->busy) {
@@ -1629,7 +1629,7 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy)
scb);
mbox->xferaddr = 0xFFFFFFFF;
- mbox64->xferaddr_lo = (uint32_t )ccb->pthru_dma_h;
+ mbox64->xferaddr_lo = (uint32_t)ccb->pthru_dma_h;
mbox64->xferaddr_hi = 0;
return scb;
@@ -1660,7 +1660,7 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy)
* A little HACK: 2nd bit is zero for all scsi read
* commands and is set for all scsi write commands
*/
- mbox->cmd = (scp->cmnd[0] & 0x02) ? MBOXCMD_LWRITE64:
+ mbox->cmd = (scp->cmnd[0] & 0x02) ? MBOXCMD_LWRITE64 :
MBOXCMD_LREAD64 ;
/*
@@ -1719,7 +1719,7 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy)
scb->dma_direction = scp->sc_data_direction;
// Calculate Scatter-Gather info
- mbox64->xferaddr_lo = (uint32_t )ccb->sgl_dma_h;
+ mbox64->xferaddr_lo = (uint32_t)ccb->sgl_dma_h;
mbox->numsge = megaraid_mbox_mksgl(adapter,
scb);
mbox->xferaddr = 0xFFFFFFFF;
@@ -1775,7 +1775,7 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy)
// over, reset the fast_load flag so that during a possible
// next scan, devices can be made available
if (rdev->fast_load && (target == 15) &&
- (SCP2CHANNEL(scp) == adapter->max_channel -1)) {
+ (SCP2CHANNEL(scp) == adapter->max_channel - 1)) {
con_log(CL_ANN, (KERN_INFO
"megaraid[%d]: physical device scan re-enabled\n",
@@ -1946,7 +1946,7 @@ megaraid_mbox_prepare_pthru(adapter_t *adapter, scb_t *scb,
target = scb->dev_target;
// 0=6sec, 1=60sec, 2=10min, 3=3hrs, 4=NO timeout
- pthru->timeout = 4;
+ pthru->timeout = 4;
pthru->ars = 1;
pthru->islogical = 0;
pthru->channel = 0;
@@ -1995,7 +1995,7 @@ megaraid_mbox_prepare_epthru(adapter_t *adapter, scb_t *scb,
target = scb->dev_target;
// 0=6sec, 1=60sec, 2=10min, 3=3hrs, 4=NO timeout
- epthru->timeout = 4;
+ epthru->timeout = 4;
epthru->ars = 1;
epthru->islogical = 0;
epthru->channel = 0;
@@ -2113,7 +2113,7 @@ megaraid_ack_sequence(adapter_t *adapter)
// Acknowledge interrupt
WRINDOOR(raid_dev, 0x02);
- } while(1);
+ } while (1);
spin_unlock_irqrestore(MAILBOX_LOCK(raid_dev), flags);
@@ -2267,7 +2267,7 @@ megaraid_mbox_dpc(unsigned long devp)
c = 0;
}
- if ((c & 0x1F ) == TYPE_DISK) {
+ if ((c & 0x1F) == TYPE_DISK) {
pdev_index = (scb->dev_channel * 16) +
scb->dev_target;
pdev_state =
@@ -2785,7 +2785,7 @@ mbox_post_sync_cmd(adapter_t *adapter, uint8_t raw_mbox[])
blocked_mailbox:
- con_log(CL_ANN, (KERN_WARNING "megaraid: blocked mailbox\n") );
+ con_log(CL_ANN, (KERN_WARNING "megaraid: blocked mailbox\n"));
return -1;
}
@@ -3291,7 +3291,7 @@ megaraid_mbox_fire_sync_cmd(adapter_t *adapter)
/* Check for interrupt line */
dword = RDOUTDOOR(raid_dev);
WROUTDOOR(raid_dev, dword);
- WRINDOOR(raid_dev,2);
+ WRINDOOR(raid_dev, 2);
return status;
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index abf7b40..2939f0e 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -136,7 +136,7 @@ mraid_mm_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
/*
* At present, we don't support the new ioctl packet
*/
- if (!old_ioctl )
+ if (!old_ioctl)
return (-EINVAL);
/*
@@ -162,7 +162,7 @@ mraid_mm_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
if (!adp->quiescent) {
con_log(CL_ANN, (KERN_WARNING
"megaraid cmm: controller cannot accept cmds due to "
- "earlier errors\n" ));
+ "earlier errors\n"));
return -EFAULT;
}
@@ -611,7 +611,7 @@ mraid_mm_alloc_kioc(mraid_mmadp_t *adp)
kioc->buf_vaddr = NULL;
kioc->buf_paddr = 0;
- kioc->pool_index =-1;
+ kioc->pool_index = -1;
kioc->free_buf = 0;
kioc->user_data = NULL;
kioc->user_data_len = 0;
@@ -639,15 +639,15 @@ mraid_mm_dealloc_kioc(mraid_mmadp_t *adp, uioc_t *kioc)
spin_lock_irqsave(&pool->lock, flags);
/*
- * While attaching the dma buffer, if we didn't get the
- * required buffer from the pool, we would have allocated
- * it at the run time and set the free_buf flag. We must
- * free that buffer. Otherwise, just mark that the buffer is
+ * While attaching the dma buffer, if we didn't get the
+ * required buffer from the pool, we would have allocated
+ * it at the run time and set the free_buf flag. We must
+ * free that buffer. Otherwise, just mark that the buffer is
* not in use
*/
if (kioc->free_buf == 1)
- dma_pool_free(pool->handle, kioc->buf_vaddr,
- kioc->buf_paddr);
+ dma_pool_free(pool->handle, kioc->buf_vaddr,
+ kioc->buf_paddr);
else
pool->in_use = 0;
@@ -748,7 +748,7 @@ ioctl_done(uioc_t *kioc)
adapter = NULL;
adapno = kioc->adapno;
- con_log(CL_ANN, ( KERN_WARNING "megaraid cmm: completed "
+ con_log(CL_ANN, (KERN_WARNING "megaraid cmm: completed "
"ioctl that was timedout before\n"));
list_for_each_entry(adapter, &adapters_list_g, list) {
@@ -758,7 +758,7 @@ ioctl_done(uioc_t *kioc)
kioc->timedout = 0;
if (adapter) {
- mraid_mm_dealloc_kioc( adapter, kioc );
+ mraid_mm_dealloc_kioc(adapter, kioc);
}
}
else {
@@ -1067,7 +1067,7 @@ mraid_mm_setup_dma_pools(mraid_mmadp_t *adp)
*/
bufsize = MRAID_MM_INIT_BUFF_SIZE;
- for (i = 0; i < MAX_DMA_POOLS; i++){
+ for (i = 0; i < MAX_DMA_POOLS; i++) {
pool = &adp->dma_pool_list[i];
@@ -1226,7 +1226,7 @@ mraid_mm_init(void)
static void __exit
mraid_mm_exit(void)
{
- con_log(CL_DLEVEL1 , ("exiting common mod\n"));
+ con_log(CL_DLEVEL1, ("exiting common mod\n"));
misc_deregister(&megaraid_mm_dev);
}
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 4d4e9db..b2a34f7 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -1666,26 +1666,33 @@ static inline void
megasas_dump_pending_frames(struct megasas_instance *instance)
{
struct megasas_cmd *cmd;
- int i,n;
+ int i, n;
union megasas_sgl *mfi_sgl;
struct megasas_io_frame *ldio;
struct megasas_pthru_frame *pthru;
u32 sgcount;
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));
+ 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));
if (IS_DMA64)
- dev_err(&instance->pdev->dev, "[%d]: 64 bit SGLs were sent to FW\n",instance->host->host_no);
+ dev_err(&instance->pdev->dev, "[%d]: 64 bit SGLs were sent to FW\n",
+ instance->host->host_no);
else
- dev_err(&instance->pdev->dev, "[%d]: 32 bit SGLs were sent to FW\n",instance->host->host_no);
+ dev_err(&instance->pdev->dev, "[%d]: 32 bit SGLs were sent to FW\n",
+ instance->host->host_no);
- dev_err(&instance->pdev->dev, "[%d]: Pending OS cmds in FW : \n",instance->host->host_no);
+ dev_err(&instance->pdev->dev, "[%d]: Pending OS cmds in FW :\n",
+ instance->host->host_no);
for (i = 0; i < max_cmd; i++) {
cmd = instance->cmd_list[i];
if (!cmd->scmd)
continue;
- dev_err(&instance->pdev->dev, "[%d]: Frame addr :0x%08lx : ",instance->host->host_no,(unsigned long)cmd->frame_phys_addr);
+ dev_err(&instance->pdev->dev, "[%d]: Frame addr :0x%08lx : ",
+ instance->host->host_no,
+ (unsigned long)cmd->frame_phys_addr);
if (megasas_cmd_type(cmd->scmd) == READ_WRITE_LDIO) {
ldio = (struct megasas_io_frame *)cmd->frame;
mfi_sgl = &ldio->sgl;
@@ -1718,7 +1725,8 @@ megasas_dump_pending_frames(struct megasas_instance *instance)
}
}
} /*for max_cmd*/
- dev_err(&instance->pdev->dev, "[%d]: Pending Internal cmds in FW : \n",instance->host->host_no);
+ dev_err(&instance->pdev->dev, "[%d]: Pending Internal cmds in FW :\n",
+ instance->host->host_no);
for (i = 0; i < max_cmd; i++) {
cmd = instance->cmd_list[i];
@@ -1726,7 +1734,8 @@ megasas_dump_pending_frames(struct megasas_instance *instance)
if (cmd->sync_cmd == 1)
dev_err(&instance->pdev->dev, "0x%08lx : ", (unsigned long)cmd->frame_phys_addr);
}
- dev_err(&instance->pdev->dev, "[%d]: Dumping Done\n\n",instance->host->host_no);
+ dev_err(&instance->pdev->dev, "[%d]: Dumping Done\n\n",
+ instance->host->host_no);
}
u32
@@ -2779,7 +2788,7 @@ static int megasas_wait_for_outstanding(struct megasas_instance *instance)
if (!(i % MEGASAS_RESET_NOTICE_INTERVAL)) {
dev_notice(&instance->pdev->dev, "[%2d]waiting for %d "
- "commands to complete\n",i,outstanding);
+ "commands to complete\n", i, outstanding);
/*
* Call cmd completion routine. Cmd to be
* be completed directly without depending on isr.
@@ -4412,7 +4421,7 @@ int megasas_alloc_cmds(struct megasas_instance *instance)
return -ENOMEM;
}
- memset(instance->cmd_list, 0, sizeof(struct megasas_cmd *) *max_cmd);
+ memset(instance->cmd_list, 0, sizeof(struct megasas_cmd *) * max_cmd);
for (i = 0; i < max_cmd; i++) {
instance->cmd_list[i] = kmalloc(sizeof(struct megasas_cmd),
@@ -6494,7 +6503,7 @@ static int megasas_init_fw(struct megasas_instance *instance)
*/
static void megasas_release_mfi(struct megasas_instance *instance)
{
- u32 reply_q_sz = sizeof(u32) *(instance->max_mfi_cmds + 1);
+ u32 reply_q_sz = sizeof(u32) * (instance->max_mfi_cmds + 1);
if (instance->reply_queue)
dma_free_coherent(&instance->pdev->dev, reply_q_sz,
--
2.7.4
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v1 2/8] scsi: megaraid_sas: use parentheses to enclose macros with complex values
2021-04-10 6:47 [PATCH v1 0/8] scsi: megaraid: some misc clean up patches Luo Jiaxing
2021-04-10 6:48 ` [PATCH v1 1/8] scsi: megaraid: clean up for white space Luo Jiaxing
@ 2021-04-10 6:48 ` Luo Jiaxing
2021-04-10 6:48 ` [PATCH v1 3/8] scsi: megaraid: clean up for blank lines Luo Jiaxing
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Luo Jiaxing @ 2021-04-10 6:48 UTC (permalink / raw)
To: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara, jejb,
martin.petersen
Cc: megaraidlinux.pdl, linux-scsi, linux-kernel, linuxarm, luojiaxing
checkpatch.pl report several error below:
ERROR: Macros with complex values should be enclosed in parentheses
+#define SCP2LUN(scp) (u32)(scp)->device->lun // to LUN
ERROR: Macros with complex values should be enclosed in parentheses
+#define SCP2ADAPTER(scp) (adapter_t *)SCSIHOST2ADAP(SCP2HOST(scp))
So fix those by enclosed by parentheses.
Signed-off-by: Jianqin Xie <xiejianqin@hisilicon.com>
Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
---
drivers/scsi/megaraid/mbox_defs.h | 2 +-
drivers/scsi/megaraid/mega_common.h | 16 ++++++++--------
drivers/scsi/megaraid/megaraid_sas.h | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/scsi/megaraid/mbox_defs.h b/drivers/scsi/megaraid/mbox_defs.h
index 5001624..3efbfdb 100644
--- a/drivers/scsi/megaraid/mbox_defs.h
+++ b/drivers/scsi/megaraid/mbox_defs.h
@@ -124,7 +124,7 @@
#define FC_MAX_PHYSICAL_DEVICES 256
#define MAX_MBOX_CHANNELS 5
#define MAX_MBOX_TARGET 15
-#define MBOX_MAX_PHYSICAL_DRIVES MAX_MBOX_CHANNELS*MAX_MBOX_TARGET
+#define MBOX_MAX_PHYSICAL_DRIVES (MAX_MBOX_CHANNELS * MAX_MBOX_TARGET)
#define MAX_ROW_SIZE_40LD 32
#define MAX_ROW_SIZE_8LD 8
#define SPAN_DEPTH_8_SPANS 8
diff --git a/drivers/scsi/megaraid/mega_common.h b/drivers/scsi/megaraid/mega_common.h
index 2ad0aa2..2a0981b 100644
--- a/drivers/scsi/megaraid/mega_common.h
+++ b/drivers/scsi/megaraid/mega_common.h
@@ -196,22 +196,22 @@ typedef struct {
// conversion from scsi command
-#define SCP2HOST(scp) (scp)->device->host // to host
-#define SCP2HOSTDATA(scp) SCP2HOST(scp)->hostdata // to soft state
-#define SCP2CHANNEL(scp) (scp)->device->channel // to channel
-#define SCP2TARGET(scp) (scp)->device->id // to target
-#define SCP2LUN(scp) (u32)(scp)->device->lun // to LUN
+#define SCP2HOST(scp) ((scp)->device->host) // to host
+#define SCP2HOSTDATA(scp) (SCP2HOST(scp)->hostdata) // to soft state
+#define SCP2CHANNEL(scp) ((scp)->device->channel) // to channel
+#define SCP2TARGET(scp) ((scp)->device->id) // to target
+#define SCP2LUN(scp) ((u32)(scp)->device->lun) // to LUN
// generic macro to convert scsi command and host to controller's soft state
#define SCSIHOST2ADAP(host) (((caddr_t *)(host->hostdata))[0])
-#define SCP2ADAPTER(scp) (adapter_t *)SCSIHOST2ADAP(SCP2HOST(scp))
+#define SCP2ADAPTER(scp) ((adapter_t *)SCSIHOST2ADAP(SCP2HOST(scp)))
#define MRAID_IS_LOGICAL(adp, scp) \
- (SCP2CHANNEL(scp) == (adp)->max_channel) ? 1 : 0
+ ((SCP2CHANNEL(scp) == (adp)->max_channel) ? 1 : 0)
#define MRAID_IS_LOGICAL_SDEV(adp, sdev) \
- (sdev->channel == (adp)->max_channel) ? 1 : 0
+ ((sdev->channel == (adp)->max_channel) ? 1 : 0)
/**
* MRAID_GET_DEVICE_MAP - device ids
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index b5a765b..b652a84 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -154,9 +154,9 @@
#define MFI_INIT_CLEAR_HANDSHAKE 0x00000008
#define MFI_INIT_HOTPLUG 0x00000010
#define MFI_STOP_ADP 0x00000020
-#define MFI_RESET_FLAGS MFI_INIT_READY| \
- MFI_INIT_MFIMODE| \
- MFI_INIT_ABORT
+#define MFI_RESET_FLAGS (MFI_INIT_READY | \
+ MFI_INIT_MFIMODE | \
+ MFI_INIT_ABORT)
#define MFI_ADP_TRIGGER_SNAP_DUMP 0x00000100
#define MPI2_IOCINIT_MSGFLAG_RDPQ_ARRAY_MODE (0x01)
--
2.7.4
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v1 3/8] scsi: megaraid: clean up for blank lines
2021-04-10 6:47 [PATCH v1 0/8] scsi: megaraid: some misc clean up patches Luo Jiaxing
2021-04-10 6:48 ` [PATCH v1 1/8] scsi: megaraid: clean up for white space Luo Jiaxing
2021-04-10 6:48 ` [PATCH v1 2/8] scsi: megaraid_sas: use parentheses to enclose macros with complex values Luo Jiaxing
@ 2021-04-10 6:48 ` Luo Jiaxing
2021-04-10 6:48 ` [PATCH v1 4/8] scsi: megaraid: clean up for open/close brace Luo Jiaxing
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Luo Jiaxing @ 2021-04-10 6:48 UTC (permalink / raw)
To: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara, jejb,
martin.petersen
Cc: megaraidlinux.pdl, linux-scsi, linux-kernel, linuxarm, luojiaxing
There are some blank line alerts when running
checkpatch.pl, so fix them together here.
Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
---
drivers/scsi/megaraid/mbox_defs.h | 1 -
drivers/scsi/megaraid/megaraid_ioctl.h | 4 ---
drivers/scsi/megaraid/megaraid_mm.h | 1 -
drivers/scsi/megaraid/megaraid_sas.h | 46 ----------------------------
drivers/scsi/megaraid/megaraid_sas_base.c | 23 --------------
drivers/scsi/megaraid/megaraid_sas_debugfs.c | 1 -
drivers/scsi/megaraid/megaraid_sas_fusion.c | 5 ---
drivers/scsi/megaraid/megaraid_sas_fusion.h | 1 -
8 files changed, 82 deletions(-)
diff --git a/drivers/scsi/megaraid/mbox_defs.h b/drivers/scsi/megaraid/mbox_defs.h
index 3efbfdb..e9b3093 100644
--- a/drivers/scsi/megaraid/mbox_defs.h
+++ b/drivers/scsi/megaraid/mbox_defs.h
@@ -244,7 +244,6 @@ typedef struct {
} __attribute__ ((packed)) mraid_passthru_t;
typedef struct {
-
uint32_t dataxferaddr_lo;
uint32_t dataxferaddr_hi;
mraid_passthru_t pthru32;
diff --git a/drivers/scsi/megaraid/megaraid_ioctl.h b/drivers/scsi/megaraid/megaraid_ioctl.h
index d0ae6f9..87b880fe 100644
--- a/drivers/scsi/megaraid/megaraid_ioctl.h
+++ b/drivers/scsi/megaraid/megaraid_ioctl.h
@@ -112,7 +112,6 @@
* : format sent by applications would be converted to this.
*/
typedef struct uioc {
-
/* User Apps: */
uint8_t signature[EXT_IOCTL_SIGN_SZ];
@@ -175,7 +174,6 @@ struct uioc_timeout {
* that total size of the structure remains 256 bytes.
*/
typedef struct mraid_hba_info {
-
uint16_t pci_vendor_id;
uint16_t pci_device_id;
uint16_t subsys_vendor_id;
@@ -209,7 +207,6 @@ typedef struct mraid_hba_info {
* @uid : unique id
*/
typedef struct mcontroller {
-
uint64_t base;
uint8_t irq;
uint8_t numldrv;
@@ -267,7 +264,6 @@ typedef struct mm_dmapool {
*/
typedef struct mraid_mmadp {
-
/* Filled by driver */
uint32_t unique_id;
diff --git a/drivers/scsi/megaraid/megaraid_mm.h b/drivers/scsi/megaraid/megaraid_mm.h
index bf40115..c48c1d9 100644
--- a/drivers/scsi/megaraid/megaraid_mm.h
+++ b/drivers/scsi/megaraid/megaraid_mm.h
@@ -58,7 +58,6 @@
*/
typedef struct mimd {
-
uint32_t inlen;
uint32_t outlen;
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index b652a84..fb0fbeeb 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -336,7 +336,6 @@ enum _MR_CRASH_BUF_STATUS {
#define MFI_MBOX_SIZE 12
enum MR_EVT_CLASS {
-
MR_EVT_CLASS_DEBUG = -2,
MR_EVT_CLASS_PROGRESS = -1,
MR_EVT_CLASS_INFO = 0,
@@ -344,11 +343,9 @@ enum MR_EVT_CLASS {
MR_EVT_CLASS_CRITICAL = 2,
MR_EVT_CLASS_FATAL = 3,
MR_EVT_CLASS_DEAD = 4,
-
};
enum MR_EVT_LOCALE {
-
MR_EVT_LOCALE_LD = 0x0001,
MR_EVT_LOCALE_PD = 0x0002,
MR_EVT_LOCALE_ENCL = 0x0004,
@@ -362,7 +359,6 @@ enum MR_EVT_LOCALE {
};
enum MR_EVT_ARGS {
-
MR_EVT_ARGS_NONE,
MR_EVT_ARGS_CDB_SENSE,
MR_EVT_ARGS_LD,
@@ -824,7 +820,6 @@ struct MR_HOST_DEVICE_LIST {
* SAS controller properties
*/
struct megasas_ctrl_prop {
-
u16 seq_num;
u16 pred_fail_poll_interval;
u16 intr_throttle_count;
@@ -939,7 +934,6 @@ struct megasas_ctrl_info {
* Host interface information
*/
struct {
-
u8 PCIX:1;
u8 PCIE:1;
u8 iSCSI:1;
@@ -949,14 +943,12 @@ struct megasas_ctrl_info {
u8 reserved_1[6];
u8 port_count;
u64 port_addr[8];
-
} __attribute__ ((packed)) host_interface;
/*
* Device (backend) interface information
*/
struct {
-
u8 SPI:1;
u8 SAS_3G:1;
u8 SATA_1_5G:1;
@@ -965,7 +957,6 @@ struct megasas_ctrl_info {
u8 reserved_1[6];
u8 port_count;
u64 port_addr[8];
-
} __attribute__ ((packed)) device_interface;
/*
@@ -975,12 +966,10 @@ struct megasas_ctrl_info {
__le32 image_component_count;
struct {
-
char name[8];
char version[32];
char build_date[16];
char built_time[16];
-
} __attribute__ ((packed)) image_component[8];
/*
@@ -992,12 +981,10 @@ struct megasas_ctrl_info {
__le32 pending_image_component_count;
struct {
-
char name[8];
char version[32];
char build_date[16];
char build_time[16];
-
} __attribute__ ((packed)) pending_image_component[8];
u8 max_arms;
@@ -1013,13 +1000,11 @@ struct megasas_ctrl_info {
* presence of the hardware
*/
struct {
-
u32 bbu:1;
u32 alarm:1;
u32 nvram:1;
u32 uart:1;
u32 reserved:28;
-
} __attribute__ ((packed)) hw_present;
__le32 current_fw_time;
@@ -1071,18 +1056,15 @@ struct megasas_ctrl_info {
* Controller capabilities structures
*/
struct {
-
u32 raid_level_0:1;
u32 raid_level_1:1;
u32 raid_level_5:1;
u32 raid_level_1E:1;
u32 raid_level_6:1;
u32 reserved:27;
-
} __attribute__ ((packed)) raid_levels;
struct {
-
u32 rbld_rate:1;
u32 cc_rate:1;
u32 bgi_rate:1;
@@ -1099,22 +1081,18 @@ struct megasas_ctrl_info {
u32 mixed_redundancy_arr:1;
u32 global_hot_spares:1;
u32 reserved:17;
-
} __attribute__ ((packed)) adapter_operations;
struct {
-
u32 read_policy:1;
u32 write_policy:1;
u32 io_policy:1;
u32 access_policy:1;
u32 disk_cache_policy:1;
u32 reserved:27;
-
} __attribute__ ((packed)) ld_operations;
struct {
-
u8 min;
u8 max;
u8 reserved[2];
@@ -1122,7 +1100,6 @@ struct megasas_ctrl_info {
} __attribute__ ((packed)) stripe_sz_ops;
struct {
-
u32 force_online:1;
u32 force_offline:1;
u32 force_rebuild:1;
@@ -1131,7 +1108,6 @@ struct megasas_ctrl_info {
} __attribute__ ((packed)) pd_operations;
struct {
-
u32 ctrl_supports_sas:1;
u32 ctrl_supports_sata:1;
u32 allow_mix_in_encl:1;
@@ -1698,14 +1674,12 @@ struct megasas_register_set {
} __attribute__ ((packed));
struct megasas_sge32 {
-
__le32 phys_addr;
__le32 length;
} __attribute__ ((packed));
struct megasas_sge64 {
-
__le64 phys_addr;
__le32 length;
@@ -1718,7 +1692,6 @@ struct megasas_sge_skinny {
} __packed;
union megasas_sgl {
-
struct megasas_sge32 sge32[1];
struct megasas_sge64 sge64[1];
struct megasas_sge_skinny sge_skinny[1];
@@ -1726,7 +1699,6 @@ union megasas_sgl {
} __attribute__ ((packed));
struct megasas_header {
-
u8 cmd; /*00h */
u8 sense_len; /*01h */
u8 cmd_status; /*02h */
@@ -1747,7 +1719,6 @@ struct megasas_header {
} __attribute__ ((packed));
union megasas_sgl_frame {
-
struct megasas_sge32 sge32[8];
struct megasas_sge64 sge64[5];
@@ -1797,7 +1768,6 @@ typedef union _MFI_CAPABILITIES {
} MFI_CAPABILITIES;
struct megasas_init_frame {
-
u8 cmd; /*00h */
u8 reserved_0; /*01h */
u8 cmd_status; /*02h */
@@ -1824,7 +1794,6 @@ struct megasas_init_frame {
} __attribute__ ((packed));
struct megasas_init_queue_info {
-
__le32 init_flags; /*00h */
__le32 reply_queue_entries; /*04h */
@@ -1838,7 +1807,6 @@ struct megasas_init_queue_info {
} __attribute__ ((packed));
struct megasas_io_frame {
-
u8 cmd; /*00h */
u8 sense_len; /*01h */
u8 cmd_status; /*02h */
@@ -1867,7 +1835,6 @@ struct megasas_io_frame {
} __attribute__ ((packed));
struct megasas_pthru_frame {
-
u8 cmd; /*00h */
u8 sense_len; /*01h */
u8 cmd_status; /*02h */
@@ -1894,7 +1861,6 @@ struct megasas_pthru_frame {
} __attribute__ ((packed));
struct megasas_dcmd_frame {
-
u8 cmd; /*00h */
u8 reserved_0; /*01h */
u8 cmd_status; /*02h */
@@ -1921,7 +1887,6 @@ struct megasas_dcmd_frame {
} __attribute__ ((packed));
struct megasas_abort_frame {
-
u8 cmd; /*00h */
u8 reserved_0; /*01h */
u8 cmd_status; /*02h */
@@ -1947,7 +1912,6 @@ struct megasas_abort_frame {
} __attribute__ ((packed));
struct megasas_smp_frame {
-
u8 cmd; /*00h */
u8 reserved_1; /*01h */
u8 cmd_status; /*02h */
@@ -1973,7 +1937,6 @@ struct megasas_smp_frame {
} __attribute__ ((packed));
struct megasas_stp_frame {
-
u8 cmd; /*00h */
u8 reserved_1; /*01h */
u8 cmd_status; /*02h */
@@ -2002,7 +1965,6 @@ struct megasas_stp_frame {
} __attribute__ ((packed));
union megasas_frame {
-
struct megasas_header hdr;
struct megasas_init_frame init;
struct megasas_io_frame io;
@@ -2033,7 +1995,6 @@ struct MR_PRIV_DEVICE {
struct megasas_cmd;
union megasas_evt_class_locale {
-
struct {
#ifndef __BIG_ENDIAN_BITFIELD
u16 locale;
@@ -2060,14 +2021,12 @@ struct megasas_evt_log_info {
} __attribute__ ((packed));
struct megasas_progress {
-
__le16 progress;
__le16 elapsed_seconds;
} __attribute__ ((packed));
struct megasas_evtarg_ld {
-
u16 target_id;
u8 ld_index;
u8 reserved;
@@ -2082,7 +2041,6 @@ struct megasas_evtarg_pd {
} __attribute__ ((packed));
struct megasas_evt_detail {
-
__le32 seq_num;
__le32 time_stamp;
__le32 code;
@@ -2263,7 +2221,6 @@ enum MR_PERF_MODE {
"Unknown")
struct megasas_instance {
-
unsigned int *reply_map;
__le32 *producer;
dma_addr_t producer_h;
@@ -2555,7 +2512,6 @@ struct megasas_instance_template {
scp->device->id)
struct megasas_cmd {
-
union megasas_frame *frame;
dma_addr_t frame_phys_addr;
u8 *sense;
@@ -2586,7 +2542,6 @@ struct megasas_cmd {
#define MAX_IOCTL_SGE 16
struct megasas_iocpacket {
-
u16 host_no;
u16 __pad1;
u32 sgl_off;
@@ -2629,7 +2584,6 @@ struct compat_megasas_iocpacket {
#define MEGASAS_IOC_GET_AEN _IOW('M', 3, struct megasas_aen)
struct megasas_mgmt_info {
-
u16 count;
struct megasas_instance *instance[MAX_MGMT_ADAPTERS];
int max_index;
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index b2a34f7..7ff5820 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -146,7 +146,6 @@ static void megasas_get_pd_info(struct megasas_instance *instance,
* PCI ID table for all supported controllers
*/
static struct pci_device_id megasas_pci_table[] = {
-
{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064R)},
/* xscale IOP */
{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078R)},
@@ -369,7 +368,6 @@ megasas_return_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd)
list_add(&cmd->list, (&instance->cmd_pool)->next);
spin_unlock_irqrestore(&instance->mfi_pool_lock, flags);
-
}
static const char *
@@ -598,7 +596,6 @@ megasas_check_reset_xscale(struct megasas_instance *instance,
}
static struct megasas_instance_template megasas_instance_template_xscale = {
-
.fire_cmd = megasas_fire_cmd_xscale,
.enable_intr = megasas_enable_intr_xscale,
.disable_intr = megasas_disable_intr_xscale,
@@ -737,7 +734,6 @@ megasas_check_reset_ppc(struct megasas_instance *instance,
}
static struct megasas_instance_template megasas_instance_template_ppc = {
-
.fire_cmd = megasas_fire_cmd_ppc,
.enable_intr = megasas_enable_intr_ppc,
.disable_intr = megasas_disable_intr_ppc,
@@ -878,7 +874,6 @@ megasas_check_reset_skinny(struct megasas_instance *instance,
}
static struct megasas_instance_template megasas_instance_template_skinny = {
-
.fire_cmd = megasas_fire_cmd_skinny,
.enable_intr = megasas_enable_intr_skinny,
.disable_intr = megasas_disable_intr_skinny,
@@ -1078,7 +1073,6 @@ megasas_check_reset_gen2(struct megasas_instance *instance,
}
static struct megasas_instance_template megasas_instance_template_gen2 = {
-
.fire_cmd = megasas_fire_cmd_gen2,
.enable_intr = megasas_enable_intr_gen2,
.disable_intr = megasas_disable_intr_gen2,
@@ -1589,7 +1583,6 @@ megasas_build_ldio(struct megasas_instance *instance, struct scsi_cmnd *scp,
((u32) scp->cmnd[3] << 16) |
((u32) scp->cmnd[4] << 8) |
(u32) scp->cmnd[5]);
-
}
/*
@@ -2995,7 +2988,6 @@ megasas_dump_fusion_io(struct scsi_cmnd *scmd)
megasas_dump(cmd->sg_frame,
instance->max_chain_frame_sz, 8);
}
-
}
/*
@@ -3473,7 +3465,6 @@ static struct device_attribute *megaraid_host_attrs[] = {
* Scsi host template for megaraid_sas driver
*/
static struct scsi_host_template megasas_template = {
-
.module = THIS_MODULE,
.name = "Avago SAS based MegaRAID driver",
.proc_name = "megaraid_sas",
@@ -4246,7 +4237,6 @@ static void megasas_teardown_frame_pool(struct megasas_instance *instance)
* Return all frames to pool
*/
for (i = 0; i < max_cmd; i++) {
-
cmd = instance->cmd_list[i];
if (cmd->frame)
@@ -4331,7 +4321,6 @@ static int megasas_create_frame_pool(struct megasas_instance *instance)
* always use 32bit context regardless of the architecture
*/
for (i = 0; i < max_cmd; i++) {
-
cmd = instance->cmd_list[i];
cmd->frame = dma_pool_zalloc(instance->frame_dma_pool,
@@ -4428,7 +4417,6 @@ int megasas_alloc_cmds(struct megasas_instance *instance)
GFP_KERNEL);
if (!instance->cmd_list[i]) {
-
for (j = 0; j < i; j++)
kfree(instance->cmd_list[j]);
@@ -4470,7 +4458,6 @@ int megasas_alloc_cmds(struct megasas_instance *instance)
*/
inline int
dcmd_timeout_ocr_possible(struct megasas_instance *instance) {
-
if (instance->adapter_type == MFI_SERIES)
return KILL_ADAPTER;
else if (instance->unload ||
@@ -4684,7 +4671,6 @@ megasas_get_pd_list(struct megasas_instance *instance)
memcpy(instance->pd_list, instance->local_pd_list,
sizeof(instance->pd_list));
break;
-
}
if (ret != DCMD_TIMEOUT)
@@ -5342,7 +5328,6 @@ megasas_get_ctrl_info(struct megasas_instance *instance)
case DCMD_FAILED:
megaraid_sas_kill_hba(instance);
break;
-
}
if (ret != DCMD_TIMEOUT)
@@ -5939,7 +5924,6 @@ megasas_alloc_irq_vectors(struct megasas_instance *instance)
instance->iopoll_q_count = 0;
i = __megasas_alloc_irq_vectors(instance);
-
}
dev_info(&instance->pdev->dev,
@@ -6099,7 +6083,6 @@ static int megasas_init_fw(struct megasas_instance *instance)
msix_enable = (instance->instancet->read_fw_status_reg(instance) &
0x4000000) >> 0x1a;
if (msix_enable && !msix_disable) {
-
scratch_pad_1 = megasas_readl
(instance, &instance->reg_set->outbound_scratch_pad_1);
/* Check max MSI-X vectors */
@@ -6223,7 +6206,6 @@ static int megasas_init_fw(struct megasas_instance *instance)
*/
if (!intr_coalescing)
instance->perf_mode = MR_LATENCY_PERF_MODE;
-
}
if (instance->perf_mode == MR_BALANCED_PERF_MODE)
@@ -7002,7 +6984,6 @@ megasas_set_dma_mask(struct megasas_instance *instance)
fail_set_dma_mask:
dev_err(&pdev->dev, "Failed to set DMA mask\n");
return -1;
-
}
/*
@@ -7194,7 +7175,6 @@ int megasas_alloc_ctrl_dma_buffers(struct megasas_instance *instance)
"Failed to allocate targetid list buffer\n");
return -ENOMEM;
}
-
}
instance->pd_list_buf =
@@ -7350,7 +7330,6 @@ void megasas_free_ctrl_dma_buffers(struct megasas_instance *instance)
HOST_DEVICE_LIST_SZ,
instance->host_device_list_buf,
instance->host_device_list_buf_h);
-
}
/*
@@ -8606,7 +8585,6 @@ static SIMPLE_DEV_PM_OPS(megasas_pm_ops, megasas_suspend, megasas_resume);
* PCI hotplug support registration structure
*/
static struct pci_driver megasas_pci_driver = {
-
.name = "megaraid_sas",
.id_table = megasas_pci_table,
.probe = megasas_probe_one,
@@ -8815,7 +8793,6 @@ void megasas_add_remove_devices(struct megasas_instance *instance,
}
}
}
-
}
static void
diff --git a/drivers/scsi/megaraid/megaraid_sas_debugfs.c b/drivers/scsi/megaraid/megaraid_sas_debugfs.c
index c6976077..5c94380 100644
--- a/drivers/scsi/megaraid/megaraid_sas_debugfs.c
+++ b/drivers/scsi/megaraid/megaraid_sas_debugfs.c
@@ -151,7 +151,6 @@ megasas_setup_debugfs(struct megasas_instance *instance)
return;
}
}
-
}
/*
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 2221175..7d10448 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -576,7 +576,6 @@ static int megasas_create_sg_sense_fusion(struct megasas_instance *instance)
offset = SCSI_SENSE_BUFFERSIZE * i;
cmd->sense = (u8 *)fusion->sense + offset;
cmd->sense_phys_addr = fusion->sense_phys_addr + offset;
-
}
return 0;
@@ -921,7 +920,6 @@ megasas_free_rdpq_fusion(struct megasas_instance *instance) {
dma_pool_free(fusion->rdpq_tracker[i].dma_pool_ptr,
fusion->rdpq_tracker[i].pool_entry_virt,
fusion->rdpq_tracker[i].pool_entry_phys);
-
}
dma_pool_destroy(fusion->reply_frames_desc_pool);
@@ -946,7 +944,6 @@ megasas_free_reply_fusion(struct megasas_instance *instance) {
fusion->reply_frames_desc_phys[0]);
dma_pool_destroy(fusion->reply_frames_desc_pool);
-
}
@@ -4602,7 +4599,6 @@ megasas_issue_tm(struct megasas_instance *instance, u16 device_handle,
}
return rc;
-
}
/*
@@ -4761,7 +4757,6 @@ int megasas_task_abort_fusion(struct scsi_cmnd *scmd)
int megasas_reset_target_fusion(struct scsi_cmnd *scmd)
{
-
struct megasas_instance *instance;
int ret = FAILED;
u16 devhandle;
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.h b/drivers/scsi/megaraid/megaraid_sas_fusion.h
index ce84f81..820a0f8 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.h
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.h
@@ -1191,7 +1191,6 @@ struct MR_DRV_RAID_MAP {
* And it is mainly for code re-use purpose.
*/
struct MR_DRV_RAID_MAP_ALL {
-
struct MR_DRV_RAID_MAP raidMap;
struct MR_LD_SPAN_MAP ldSpanMap[MAX_LOGICAL_DRIVES_DYN - 1];
} __packed;
--
2.7.4
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v1 4/8] scsi: megaraid: clean up for open/close brace
2021-04-10 6:47 [PATCH v1 0/8] scsi: megaraid: some misc clean up patches Luo Jiaxing
` (2 preceding siblings ...)
2021-04-10 6:48 ` [PATCH v1 3/8] scsi: megaraid: clean up for blank lines Luo Jiaxing
@ 2021-04-10 6:48 ` Luo Jiaxing
2021-04-10 6:48 ` [PATCH v1 5/8] scsi: megaraid: clean up for "foo * bar" Luo Jiaxing
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Luo Jiaxing @ 2021-04-10 6:48 UTC (permalink / raw)
To: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara, jejb,
martin.petersen
Cc: megaraidlinux.pdl, linux-scsi, linux-kernel, linuxarm, luojiaxing
There are few kinds of error about open/close brace is reported by
checkpatch.pl:
ERROR: open brace '{' following function definitions go on the next line
int
megasas_sync_pd_seq_num(struct megasas_instance *instance, bool pend) {
ERROR: else should follow close brace '}'
+ }
+ else
So fix them all.
Signed-off-by: Jianqin Xie <xiejianqin@hisilicon.com>
Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
---
drivers/scsi/megaraid/megaraid_mbox.c | 57 ++++++++++-------------------
drivers/scsi/megaraid/megaraid_mm.c | 10 ++---
drivers/scsi/megaraid/megaraid_sas_base.c | 7 ++--
drivers/scsi/megaraid/megaraid_sas_fusion.c | 11 +++---
4 files changed, 31 insertions(+), 54 deletions(-)
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 6d76b15..d3fcaca 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -537,8 +537,7 @@ megaraid_detach_one(struct pci_dev *pdev)
pdev->subsystem_device));
return;
- }
- else {
+ } else {
con_log(CL_ANN, (KERN_NOTICE
"megaraid: detaching device %#4.04x:%#4.04x:%#4.04x:%#4.04x\n",
pdev->vendor, pdev->device, pdev->subsystem_vendor,
@@ -1545,8 +1544,7 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy)
vaddr = (caddr_t) sg_virt(&sgl[0]);
memset(vaddr, 0, scp->cmnd[4]);
- }
- else {
+ } else {
con_log(CL_ANN, (KERN_WARNING
"megaraid mailbox: invalid sg:%d\n",
__LINE__));
@@ -1705,8 +1703,7 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy)
((uint32_t)scp->cmnd[7] << 16) |
((uint32_t)scp->cmnd[8] << 8) |
(uint32_t)scp->cmnd[9];
- }
- else {
+ } else {
con_log(CL_ANN, (KERN_WARNING
"megaraid: unsupported CDB length\n"));
@@ -1762,8 +1759,7 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy)
scp->result = (DID_BAD_TARGET << 16);
return NULL;
}
- }
- else { // Passthru device commands
+ } else { // Passthru device commands
// Do not allow access to target id > 15 or LUN > 7
if (target > 15 || SCP2LUN(scp) > 7) {
@@ -1830,8 +1826,7 @@ megaraid_mbox_build_cmd(adapter_t *adapter, struct scsi_cmnd *scp, int *busy)
mbox64->xferaddr_lo = (uint32_t)ccb->epthru_dma_h;
mbox64->xferaddr_hi = 0;
mbox->xferaddr = 0xFFFFFFFF;
- }
- else {
+ } else {
mbox->cmd = MBOXCMD_PASSTHRU64;
megaraid_mbox_prepare_pthru(adapter, scb, scp);
@@ -1961,8 +1956,7 @@ megaraid_mbox_prepare_pthru(adapter_t *adapter, scb_t *scb,
pthru->dataxferlen = scsi_bufflen(scp);
pthru->dataxferaddr = ccb->sgl_dma_h;
pthru->numsge = megaraid_mbox_mksgl(adapter, scb);
- }
- else {
+ } else {
pthru->dataxferaddr = 0;
pthru->dataxferlen = 0;
pthru->numsge = 0;
@@ -2010,8 +2004,7 @@ megaraid_mbox_prepare_epthru(adapter_t *adapter, scb_t *scb,
epthru->dataxferlen = scsi_bufflen(scp);
epthru->dataxferaddr = ccb->sgl_dma_h;
epthru->numsge = megaraid_mbox_mksgl(adapter, scb);
- }
- else {
+ } else {
epthru->dataxferaddr = 0;
epthru->dataxferlen = 0;
epthru->numsge = 0;
@@ -2100,8 +2093,7 @@ megaraid_ack_sequence(adapter_t *adapter)
// a cmm command
scb = adapter->uscb_list + (completed[i] -
MBOX_MAX_SCSI_CMDS);
- }
- else {
+ } else {
// an os command
scb = adapter->kscb_list + completed[i];
}
@@ -2303,8 +2295,7 @@ megaraid_mbox_dpc(unsigned long devp)
scp->result = DRIVER_SENSE << 24 |
DID_OK << 16 | CHECK_CONDITION << 1;
- }
- else {
+ } else {
if (mbox->cmd == MBOXCMD_EXTPTHRU) {
memcpy(scp->sense_buffer,
@@ -2335,8 +2326,7 @@ megaraid_mbox_dpc(unsigned long devp)
if (scp->cmnd[0] == TEST_UNIT_READY) {
scp->result = DID_ERROR << 16 |
RESERVATION_CONFLICT << 1;
- }
- else
+ } else
/*
* Error code returned is 1 if Reserve or Release
* failed or the input parameter is invalid
@@ -2346,8 +2336,7 @@ megaraid_mbox_dpc(unsigned long devp)
scp->result = DID_ERROR << 16 |
RESERVATION_CONFLICT << 1;
- }
- else {
+ } else {
scp->result = DID_BAD_TARGET << 16 | status;
}
}
@@ -2485,8 +2474,7 @@ megaraid_abort_handler(struct scsi_cmnd *scp)
"megaraid abort: %d[%d:%d], invalid state\n",
scb->sno, scb->dev_channel, scb->dev_target));
BUG();
- }
- else {
+ } else {
con_log(CL_ANN, (KERN_WARNING
"megaraid abort: %d[%d:%d], fw owner\n",
scb->sno, scb->dev_channel, scb->dev_target));
@@ -2621,8 +2609,7 @@ megaraid_reset_handler(struct scsi_cmnd *scp)
rval = FAILED;
goto out;
- }
- else {
+ } else {
con_log(CL_ANN, (KERN_NOTICE
"megaraid mbox: reset sequence completed successfully\n"));
}
@@ -2642,8 +2629,7 @@ megaraid_reset_handler(struct scsi_cmnd *scp)
if (mbox_post_sync_cmd_fast(adapter, raw_mbox) == 0) {
con_log(CL_ANN,
(KERN_INFO "megaraid: reservation reset\n"));
- }
- else {
+ } else {
rval = FAILED;
con_log(CL_ANN, (KERN_WARNING
"megaraid: reservation reset failed\n"));
@@ -3147,8 +3133,7 @@ megaraid_mbox_get_max_sg(adapter_t *adapter)
// Issue the command
if (mbox_post_sync_cmd(adapter, raw_mbox) == 0) {
nsg = *(uint8_t *)adapter->ibuf;
- }
- else {
+ } else {
nsg = MBOX_DEFAULT_SG_SIZE;
}
@@ -3940,21 +3925,18 @@ megaraid_sysfs_get_ldmap(adapter_t *adapter)
"megaraid: sysfs get ld map timed out\n"));
rval = -ETIME;
- }
- else {
+ } else {
rval = mbox->status;
}
if (rval == 0) {
memcpy(raid_dev->curr_ldmap, ldmap,
sizeof(raid_dev->curr_ldmap));
- }
- else {
+ } else {
con_log(CL_ANN, (KERN_NOTICE
"megaraid: get ld map failed with %x\n", rval));
}
- }
- else {
+ } else {
con_log(CL_ANN, (KERN_NOTICE
"megaraid: could not issue ldmap command:%x\n", rval));
}
@@ -4050,8 +4032,7 @@ megaraid_sysfs_show_ldnum(struct device *dev, struct device_attribute *attr, cha
break;
}
}
- }
- else {
+ } else {
con_log(CL_ANN, (KERN_NOTICE
"megaraid: sysfs get ld map failed: %x\n",
rval));
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index 2939f0e..864cbb6 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -390,8 +390,7 @@ mimd_to_kioc(mimd_t __user *umimd, mraid_mmadp_t *adp, uioc_t *kioc)
if (mraid_mm_attach_buf(adp, kioc, kioc->xferlen))
return (-ENOMEM);
- }
- else {
+ } else {
con_log(CL_ANN, (KERN_WARNING
"megaraid cmm: Invalid subop\n"));
return (-EINVAL);
@@ -539,8 +538,7 @@ mraid_mm_attach_buf(mraid_mmadp_t *adp, uioc_t *kioc, int xferlen)
spin_unlock_irqrestore(&pool->lock, flags);
return 0;
- }
- else {
+ } else {
spin_unlock_irqrestore(&pool->lock, flags);
continue;
}
@@ -760,10 +758,8 @@ ioctl_done(uioc_t *kioc)
if (adapter) {
mraid_mm_dealloc_kioc(adapter, kioc);
}
- }
- else {
+ } else
wake_up(&wait_q);
- }
}
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 7ff5820..40c77bb 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -3199,8 +3199,7 @@ megasas_service_aen(struct megasas_instance *instance, struct megasas_cmd *cmd)
spin_unlock_irqrestore(&poll_aen_lock, flags);
wake_up(&megasas_poll_wait);
kill_fasync(&megasas_async_queue, SIGIO, POLL_IN);
- }
- else
+ } else
cmd->abort_aen = 0;
instance->aen_cmd = NULL;
@@ -5686,8 +5685,8 @@ megasas_setup_irqs_msix(struct megasas_instance *instance, u8 is_probe)
* return: void
*/
static void
-megasas_destroy_irqs(struct megasas_instance *instance) {
-
+megasas_destroy_irqs(struct megasas_instance *instance)
+{
int i;
int count;
struct megasas_irq_context *irq_ctx;
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 7d10448..4591262 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -908,8 +908,8 @@ megasas_alloc_rdpq_fusion(struct megasas_instance *instance)
}
static void
-megasas_free_rdpq_fusion(struct megasas_instance *instance) {
-
+megasas_free_rdpq_fusion(struct megasas_instance *instance)
+{
int i;
struct fusion_context *fusion;
@@ -932,8 +932,8 @@ megasas_free_rdpq_fusion(struct megasas_instance *instance) {
}
static void
-megasas_free_reply_fusion(struct megasas_instance *instance) {
-
+megasas_free_reply_fusion(struct megasas_instance *instance)
+{
struct fusion_context *fusion;
fusion = instance->ctrl_context;
@@ -1296,7 +1296,8 @@ megasas_ioc_init_fusion(struct megasas_instance *instance)
* issue and receive command.
*/
int
-megasas_sync_pd_seq_num(struct megasas_instance *instance, bool pend) {
+megasas_sync_pd_seq_num(struct megasas_instance *instance, bool pend)
+{
int ret = 0;
size_t pd_seq_map_sz;
struct megasas_cmd *cmd;
--
2.7.4
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v1 5/8] scsi: megaraid: clean up for "foo * bar"
2021-04-10 6:47 [PATCH v1 0/8] scsi: megaraid: some misc clean up patches Luo Jiaxing
` (3 preceding siblings ...)
2021-04-10 6:48 ` [PATCH v1 4/8] scsi: megaraid: clean up for open/close brace Luo Jiaxing
@ 2021-04-10 6:48 ` Luo Jiaxing
2021-04-10 6:48 ` [PATCH v1 6/8] scsi: megaraid: clean up for code indent Luo Jiaxing
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Luo Jiaxing @ 2021-04-10 6:48 UTC (permalink / raw)
To: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara, jejb,
martin.petersen
Cc: megaraidlinux.pdl, linux-scsi, linux-kernel, linuxarm, luojiaxing
Following error is reported by checkpatch.pl:
"foo * bar" should be "foo *bar"
+ struct megasas_iocpacket __user * user_ioc,
The format of the pointer variable must be "foo *bar", so fix
them.
Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
---
drivers/scsi/megaraid/megaraid_ioctl.h | 4 ++--
drivers/scsi/megaraid/megaraid_mbox.h | 2 +-
drivers/scsi/megaraid/megaraid_mm.c | 4 ++--
drivers/scsi/megaraid/megaraid_sas_base.c | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/scsi/megaraid/megaraid_ioctl.h b/drivers/scsi/megaraid/megaraid_ioctl.h
index 87b880fe..9bc0250 100644
--- a/drivers/scsi/megaraid/megaraid_ioctl.h
+++ b/drivers/scsi/megaraid/megaraid_ioctl.h
@@ -126,7 +126,7 @@ typedef struct uioc {
uint8_t reserved[128];
/* Driver Data: */
- void __user * user_data;
+ void __user *user_data;
uint32_t user_data_len;
/* 64bit alignment */
@@ -138,7 +138,7 @@ typedef struct uioc {
dma_addr_t pthru32_h;
struct list_head list;
- void (*done)(struct uioc*);
+ void (*done)(struct uioc *);
caddr_t buf_vaddr;
dma_addr_t buf_paddr;
diff --git a/drivers/scsi/megaraid/megaraid_mbox.h b/drivers/scsi/megaraid/megaraid_mbox.h
index d2fe7f6..3c16d38 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.h
+++ b/drivers/scsi/megaraid/megaraid_mbox.h
@@ -189,7 +189,7 @@ typedef struct {
dma_addr_t mbox_dma;
spinlock_t mailbox_lock;
unsigned long baseport;
- void __iomem * baseaddr;
+ void __iomem *baseaddr;
struct mraid_pci_blk mbox_pool[MBOX_MAX_SCSI_CMDS];
struct dma_pool *mbox_pool_handle;
struct mraid_pci_blk epthru_pool[MBOX_MAX_SCSI_CMDS];
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index 864cbb6..234885c 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -582,7 +582,7 @@ static uioc_t *
mraid_mm_alloc_kioc(mraid_mmadp_t *adp)
{
uioc_t *kioc;
- struct list_head* head;
+ struct list_head *head;
unsigned long flags;
down(&adp->kioc_semaphore);
@@ -722,7 +722,7 @@ ioctl_done(uioc_t *kioc)
{
uint32_t adapno;
int iterator;
- mraid_mmadp_t* adapter;
+ mraid_mmadp_t *adapter;
/*
* When the kioc returns from driver, make sure it still doesn't
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 40c77bb..2b17529 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -4402,7 +4402,7 @@ int megasas_alloc_cmds(struct megasas_instance *instance)
* Allocate the dynamic array first and then allocate individual
* commands.
*/
- instance->cmd_list = kcalloc(max_cmd, sizeof(struct megasas_cmd*), GFP_KERNEL);
+ instance->cmd_list = kcalloc(max_cmd, sizeof(struct megasas_cmd *), GFP_KERNEL);
if (!instance->cmd_list) {
dev_printk(KERN_DEBUG, &instance->pdev->dev, "out of memory\n");
@@ -8150,7 +8150,7 @@ static int megasas_set_crash_dump_params_ioctl(struct megasas_cmd *cmd)
*/
static int
megasas_mgmt_fw_ioctl(struct megasas_instance *instance,
- struct megasas_iocpacket __user * user_ioc,
+ struct megasas_iocpacket __user *user_ioc,
struct megasas_iocpacket *ioc)
{
struct megasas_sge64 *kern_sge64 = NULL;
--
2.7.4
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v1 6/8] scsi: megaraid: clean up for code indent
2021-04-10 6:47 [PATCH v1 0/8] scsi: megaraid: some misc clean up patches Luo Jiaxing
` (4 preceding siblings ...)
2021-04-10 6:48 ` [PATCH v1 5/8] scsi: megaraid: clean up for "foo * bar" Luo Jiaxing
@ 2021-04-10 6:48 ` Luo Jiaxing
2021-04-10 6:48 ` [PATCH v1 7/8] scsi: megaraid: clean up for trailing statements Luo Jiaxing
2021-04-10 6:48 ` [PATCH v1 8/8] scsi: megaraid: clean up for static variable initialise to 0 Luo Jiaxing
7 siblings, 0 replies; 9+ messages in thread
From: Luo Jiaxing @ 2021-04-10 6:48 UTC (permalink / raw)
To: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara, jejb,
martin.petersen
Cc: megaraidlinux.pdl, linux-scsi, linux-kernel, linuxarm, luojiaxing
Following error is reported by checkpatch.pl
ERROR: code indent should use tabs where possible
+^I^I unsigned long arg)$
So fix them all.
Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
---
drivers/scsi/megaraid/mega_common.h | 2 +-
drivers/scsi/megaraid/megaraid_mm.c | 2 +-
drivers/scsi/megaraid/megaraid_sas_base.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/megaraid/mega_common.h b/drivers/scsi/megaraid/mega_common.h
index 2a0981b..9a19eec 100644
--- a/drivers/scsi/megaraid/mega_common.h
+++ b/drivers/scsi/megaraid/mega_common.h
@@ -249,7 +249,7 @@ typedef struct {
* ### Helper routines ###
*/
#define LSI_DBGLVL mraid_debug_level // each LLD must define a global
- // mraid_debug_level
+ // mraid_debug_level
#ifdef DEBUG
#if defined (_ASSERT_PANIC)
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index 234885c..1d6244e 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -213,7 +213,7 @@ mraid_mm_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
static long
mraid_mm_unlocked_ioctl(struct file *filep, unsigned int cmd,
- unsigned long arg)
+ unsigned long arg)
{
int err;
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 2b17529..f29a3716 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -4821,7 +4821,7 @@ megasas_ld_list_query(struct megasas_instance *instance, u8 query_type)
if (!cmd) {
dev_warn(&instance->pdev->dev,
- "megasas_ld_list_query: Failed to get cmd\n");
+ "%s: Failed to get cmd\n", __func__);
return -ENOMEM;
}
--
2.7.4
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v1 7/8] scsi: megaraid: clean up for trailing statements
2021-04-10 6:47 [PATCH v1 0/8] scsi: megaraid: some misc clean up patches Luo Jiaxing
` (5 preceding siblings ...)
2021-04-10 6:48 ` [PATCH v1 6/8] scsi: megaraid: clean up for code indent Luo Jiaxing
@ 2021-04-10 6:48 ` Luo Jiaxing
2021-04-10 6:48 ` [PATCH v1 8/8] scsi: megaraid: clean up for static variable initialise to 0 Luo Jiaxing
7 siblings, 0 replies; 9+ messages in thread
From: Luo Jiaxing @ 2021-04-10 6:48 UTC (permalink / raw)
To: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara, jejb,
martin.petersen
Cc: megaraidlinux.pdl, linux-scsi, linux-kernel, linuxarm, luojiaxing
Following error is reported by checkpatch.pl:
ERROR: trailing statements should be on next line
+ if (iterator++ == adapno) break;
So fix them.
Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
---
drivers/scsi/megaraid/megaraid_mbox.c | 30 ++++++++++++++++++++----------
drivers/scsi/megaraid/megaraid_mm.c | 24 ++++++++++++++++--------
2 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index d3fcaca..486c01d 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -709,7 +709,8 @@ megaraid_init_mbox(adapter_t *adapter)
* controllers
*/
raid_dev = kzalloc(sizeof(mraid_device_t), GFP_KERNEL);
- if (raid_dev == NULL) return -1;
+ if (!raid_dev)
+ return -1;
/*
@@ -2051,7 +2052,8 @@ megaraid_ack_sequence(adapter_t *adapter)
* interrupt line low.
*/
dword = RDOUTDOOR(raid_dev);
- if (dword != 0x10001234) break;
+ if (dword != 0x10001234)
+ break;
handled = 1;
@@ -2074,7 +2076,8 @@ megaraid_ack_sequence(adapter_t *adapter)
// wait for valid command index to post
for (j = 0; j < 0xFFFFF; j++) {
- if (mbox->completed[i] != 0xFF) break;
+ if (mbox->completed[i] != 0xFF)
+ break;
rmb();
}
completed[i] = mbox->completed[i];
@@ -2182,7 +2185,8 @@ megaraid_mbox_dpc(unsigned long devp)
uioc_t *kioc;
- if (!adapter) return;
+ if (!adapter)
+ return;
raid_dev = ADAP2RAIDDEV(adapter);
@@ -2796,7 +2800,8 @@ mbox_post_sync_cmd_fast(adapter_t *adapter, uint8_t raw_mbox[])
mbox = raid_dev->mbox;
// return immediately if the mailbox is busy
- if (mbox->busy) return -1;
+ if (mbox->busy)
+ return -1;
// Copy mailbox data into host structure
memcpy((caddr_t)mbox, (caddr_t)raw_mbox, 14);
@@ -2811,7 +2816,8 @@ mbox_post_sync_cmd_fast(adapter_t *adapter, uint8_t raw_mbox[])
WRINDOOR(raid_dev, raid_dev->mbox_dma | 0x1);
for (i = 0; i < MBOX_SYNC_WAIT_CNT; i++) {
- if (mbox->numstatus != 0xFF) break;
+ if (mbox->numstatus != 0xFF)
+ break;
rmb();
udelay(MBOX_SYNC_DELAY_200);
}
@@ -2848,8 +2854,10 @@ megaraid_busywait_mbox(mraid_device_t *raid_dev)
msleep(1);
}
- if (i < 1000) return 0;
- else return -1;
+ if (i < 1000)
+ return 0;
+ else
+ return -1;
}
@@ -3137,7 +3145,8 @@ megaraid_mbox_get_max_sg(adapter_t *adapter)
nsg = MBOX_DEFAULT_SG_SIZE;
}
- if (nsg > MBOX_MAX_SG_SIZE) nsg = MBOX_MAX_SG_SIZE;
+ if (nsg > MBOX_MAX_SG_SIZE)
+ nsg = MBOX_MAX_SG_SIZE;
return nsg;
}
@@ -3317,7 +3326,8 @@ megaraid_mbox_display_scb(adapter_t *adapter, scb_t *scb)
mbox->numsectors, mbox->lba, mbox->xferaddr, mbox->logdrv,
mbox->numsge));
- if (!scp) return;
+ if (!scp)
+ return;
con_log(level, (KERN_NOTICE "scsi cmnd: "));
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index 1d6244e..5e889cb 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -88,7 +88,8 @@ mraid_mm_open(struct inode *inode, struct file *filep)
/*
* Only allow superuser to access private ioctl interface
*/
- if (!capable(CAP_SYS_ADMIN)) return (-EACCES);
+ if (!capable(CAP_SYS_ADMIN))
+ return (-EACCES);
return 0;
}
@@ -256,7 +257,8 @@ mraid_mm_get_adapter(mimd_t __user *umimd, int *rval)
iterator = 0;
list_for_each_entry(adapter, &adapters_list_g, list) {
- if (iterator++ == adapno) break;
+ if (iterator++ == adapno)
+ break;
}
if (!adapter) {
@@ -408,8 +410,10 @@ mimd_to_kioc(mimd_t __user *umimd, mraid_mmadp_t *adp, uioc_t *kioc)
if (mraid_mm_attach_buf(adp, kioc, kioc->xferlen))
return (-ENOMEM);
- if (mimd.outlen) kioc->data_dir = UIOC_RD;
- if (mimd.inlen) kioc->data_dir |= UIOC_WR;
+ if (mimd.outlen)
+ kioc->data_dir = UIOC_RD;
+ if (mimd.inlen)
+ kioc->data_dir |= UIOC_WR;
break;
@@ -424,8 +428,10 @@ mimd_to_kioc(mimd_t __user *umimd, mraid_mmadp_t *adp, uioc_t *kioc)
if (mraid_mm_attach_buf(adp, kioc, kioc->xferlen))
return (-ENOMEM);
- if (mimd.outlen) kioc->data_dir = UIOC_RD;
- if (mimd.inlen) kioc->data_dir |= UIOC_WR;
+ if (mimd.outlen)
+ kioc->data_dir = UIOC_RD;
+ if (mimd.inlen)
+ kioc->data_dir |= UIOC_WR;
break;
@@ -677,7 +683,8 @@ lld_ioctl(mraid_mmadp_t *adp, uioc_t *kioc)
kioc->status = -ENODATA;
rval = adp->issue_uioc(adp->drvr_data, kioc, IOCTL_ISSUE);
- if (rval) return rval;
+ if (rval)
+ return rval;
/*
* Start the timer
@@ -750,7 +757,8 @@ ioctl_done(uioc_t *kioc)
"ioctl that was timedout before\n"));
list_for_each_entry(adapter, &adapters_list_g, list) {
- if (iterator++ == adapno) break;
+ if (iterator++ == adapno)
+ break;
}
kioc->timedout = 0;
--
2.7.4
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v1 8/8] scsi: megaraid: clean up for static variable initialise to 0
2021-04-10 6:47 [PATCH v1 0/8] scsi: megaraid: some misc clean up patches Luo Jiaxing
` (6 preceding siblings ...)
2021-04-10 6:48 ` [PATCH v1 7/8] scsi: megaraid: clean up for trailing statements Luo Jiaxing
@ 2021-04-10 6:48 ` Luo Jiaxing
7 siblings, 0 replies; 9+ messages in thread
From: Luo Jiaxing @ 2021-04-10 6:48 UTC (permalink / raw)
To: kashyap.desai, sumit.saxena, shivasharan.srikanteshwara, jejb,
martin.petersen
Cc: megaraidlinux.pdl, linux-scsi, linux-kernel, linuxarm, luojiaxing
Following error is reported by checkpatch.pl:
ERROR: do not initialise statics to 0
+static int megaraid_expose_unconf_disks = 0;
So fix them.
Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
---
drivers/scsi/megaraid/megaraid_mbox.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 486c01d..0f8fcbf 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -146,7 +146,7 @@ MODULE_VERSION(MEGARAID_VERSION);
/*
* Set to enable driver to expose unconfigured disk to kernel
*/
-static int megaraid_expose_unconf_disks = 0;
+static int megaraid_expose_unconf_disks;
module_param_named(unconf_disks, megaraid_expose_unconf_disks, int, 0);
MODULE_PARM_DESC(unconf_disks,
"Set to expose unconfigured disks to kernel (default=0)");
@@ -181,7 +181,7 @@ MODULE_PARM_DESC(cmd_per_lun,
* This would result in non-disk devices being skipped during driver load
* time. These can be later added though, using /proc/scsi/scsi
*/
-static unsigned int megaraid_fast_load = 0;
+static unsigned int megaraid_fast_load;
module_param_named(fast_load, megaraid_fast_load, int, 0);
MODULE_PARM_DESC(fast_load,
"Faster loading of the driver, skips physical devices! (default=0)");
--
2.7.4
^ permalink raw reply [flat|nested] 9+ messages in thread