* [PATCH v3 0/2] scsi: pm8001: tiny clean up patches
@ 2021-04-08 12:56 Luo Jiaxing
2021-04-08 12:56 ` [PATCH v3 1/2] scsi: pm8001: clean up for white space Luo Jiaxing
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Luo Jiaxing @ 2021-04-08 12:56 UTC (permalink / raw)
To: jinpu.wang, jejb, martin.petersen
Cc: linux-scsi, linux-kernel, linuxarm, luojiaxing
Several error is reported by checkpatch.pl, here are two patches to clean
them up.
---
v1->v2:
1. modify AAP1_MEMMAP() to inline function
2. set flash_command_table and flash_error_table as const
v2->v3:
1. use lower case names for AAP1_MEMMAP
---
Luo Jiaxing (2):
scsi: pm8001: clean up for white space
scsi: pm8001: clean up for open brace
drivers/scsi/pm8001/pm8001_ctl.c | 26 +++++++++++---------------
drivers/scsi/pm8001/pm8001_ctl.h | 5 +++++
drivers/scsi/pm8001/pm8001_hwi.c | 14 +++++++-------
drivers/scsi/pm8001/pm8001_sas.c | 20 ++++++++++----------
drivers/scsi/pm8001/pm8001_sas.h | 2 +-
drivers/scsi/pm8001/pm80xx_hwi.c | 14 +++++++-------
6 files changed, 41 insertions(+), 40 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 1/2] scsi: pm8001: clean up for white space
2021-04-08 12:56 [PATCH v3 0/2] scsi: pm8001: tiny clean up patches Luo Jiaxing
@ 2021-04-08 12:56 ` Luo Jiaxing
2021-04-09 6:07 ` Jinpu Wang
2021-04-08 12:56 ` [PATCH v3 2/2] scsi: pm8001: clean up for open brace Luo Jiaxing
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Luo Jiaxing @ 2021-04-08 12:56 UTC (permalink / raw)
To: jinpu.wang, jejb, martin.petersen
Cc: linux-scsi, linux-kernel, linuxarm, luojiaxing
Some errors are found like below when run checkpatch.pl
ERROR: space prohibited before that ',' (ctx:WxW)
+int pm8001_mpi_general_event(struct pm8001_hba_info *pm8001_ha , void *piomb);
It all about white space, so fix them.
Signed-off-by: Jianqin Xie <xiejianqin@hisilicon.com>
Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
---
drivers/scsi/pm8001/pm8001_ctl.c | 20 +++++++++-----------
drivers/scsi/pm8001/pm8001_ctl.h | 5 +++++
drivers/scsi/pm8001/pm8001_hwi.c | 14 +++++++-------
drivers/scsi/pm8001/pm8001_sas.c | 20 ++++++++++----------
drivers/scsi/pm8001/pm8001_sas.h | 2 +-
drivers/scsi/pm8001/pm80xx_hwi.c | 14 +++++++-------
6 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/drivers/scsi/pm8001/pm8001_ctl.c b/drivers/scsi/pm8001/pm8001_ctl.c
index 12035ba..90b816f 100644
--- a/drivers/scsi/pm8001/pm8001_ctl.c
+++ b/drivers/scsi/pm8001/pm8001_ctl.c
@@ -369,24 +369,22 @@ static ssize_t pm8001_ctl_aap_log_show(struct device *cdev,
struct Scsi_Host *shost = class_to_shost(cdev);
struct sas_ha_struct *sha = SHOST_TO_SAS_HA(shost);
struct pm8001_hba_info *pm8001_ha = sha->lldd_ha;
+ u8 *ptr = (u8 *)pm8001_ha->memoryMap.region[AAP1].virt_ptr;
int i;
-#define AAP1_MEMMAP(r, c) \
- (*(u32 *)((u8*)pm8001_ha->memoryMap.region[AAP1].virt_ptr + (r) * 32 \
- + (c)))
char *str = buf;
int max = 2;
for (i = 0; i < max; i++) {
str += sprintf(str, "0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x"
"0x%08x 0x%08x\n",
- AAP1_MEMMAP(i, 0),
- AAP1_MEMMAP(i, 4),
- AAP1_MEMMAP(i, 8),
- AAP1_MEMMAP(i, 12),
- AAP1_MEMMAP(i, 16),
- AAP1_MEMMAP(i, 20),
- AAP1_MEMMAP(i, 24),
- AAP1_MEMMAP(i, 28));
+ pm8001_ctl_aap1_memmap(ptr, i, 0),
+ pm8001_ctl_aap1_memmap(ptr, i, 4),
+ pm8001_ctl_aap1_memmap(ptr, i, 8),
+ pm8001_ctl_aap1_memmap(ptr, i, 12),
+ pm8001_ctl_aap1_memmap(ptr, i, 16),
+ pm8001_ctl_aap1_memmap(ptr, i, 20),
+ pm8001_ctl_aap1_memmap(ptr, i, 24),
+ pm8001_ctl_aap1_memmap(ptr, i, 28));
}
return str - buf;
diff --git a/drivers/scsi/pm8001/pm8001_ctl.h b/drivers/scsi/pm8001/pm8001_ctl.h
index d0d43a2..4743f0d 100644
--- a/drivers/scsi/pm8001/pm8001_ctl.h
+++ b/drivers/scsi/pm8001/pm8001_ctl.h
@@ -59,5 +59,10 @@
#define SYSFS_OFFSET 1024
#define PM80XX_IB_OB_QUEUE_SIZE (32 * 1024)
#define PM8001_IB_OB_QUEUE_SIZE (16 * 1024)
+
+static inline u32 pm8001_ctl_aap1_memmap(u8 *ptr, int idx, int off)
+{
+ return *(u32 *)(ptr + idx * 32 + off);
+}
#endif /* PM8001_CTL_H_INCLUDED */
diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index 49bf2f7..6887fa3 100644
--- a/drivers/scsi/pm8001/pm8001_hwi.c
+++ b/drivers/scsi/pm8001/pm8001_hwi.c
@@ -1826,7 +1826,7 @@ static void pm8001_send_read_log(struct pm8001_hba_info *pm8001_ha,
* that the task has been finished.
*/
static void
-mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha , void *piomb)
+mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
{
struct sas_task *t;
struct pm8001_ccb_info *ccb;
@@ -2058,7 +2058,7 @@ mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha , void *piomb)
}
/*See the comments for mpi_ssp_completion */
-static void mpi_ssp_event(struct pm8001_hba_info *pm8001_ha , void *piomb)
+static void mpi_ssp_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
{
struct sas_task *t;
unsigned long flags;
@@ -2294,9 +2294,9 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
(status != IO_UNDERFLOW)) {
if (!((t->dev->parent) &&
(dev_is_expander(t->dev->parent->dev_type)))) {
- for (i = 0 , j = 4; j <= 7 && i <= 3; i++ , j++)
+ for (i = 0, j = 4; j <= 7 && i <= 3; i++, j++)
sata_addr_low[i] = pm8001_ha->sas_addr[j];
- for (i = 0 , j = 0; j <= 3 && i <= 3; i++ , j++)
+ for (i = 0, j = 0; j <= 3 && i <= 3; i++, j++)
sata_addr_hi[i] = pm8001_ha->sas_addr[j];
memcpy(&temp_sata_addr_low, sata_addr_low,
sizeof(sata_addr_low));
@@ -2625,7 +2625,7 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
}
/*See the comments for mpi_ssp_completion */
-static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha , void *piomb)
+static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
{
struct sas_task *t;
struct task_status_struct *ts;
@@ -3602,7 +3602,7 @@ int pm8001_mpi_fw_flash_update_resp(struct pm8001_hba_info *pm8001_ha,
return 0;
}
-int pm8001_mpi_general_event(struct pm8001_hba_info *pm8001_ha , void *piomb)
+int pm8001_mpi_general_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
{
u32 status;
int i;
@@ -3685,7 +3685,7 @@ int pm8001_mpi_task_abort_resp(struct pm8001_hba_info *pm8001_ha, void *piomb)
* @pm8001_ha: our hba card information
* @piomb: IO message buffer
*/
-static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb)
+static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
{
unsigned long flags;
struct hw_event_resp *pPayload =
diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
index a98d449..43b77ac 100644
--- a/drivers/scsi/pm8001/pm8001_sas.c
+++ b/drivers/scsi/pm8001/pm8001_sas.c
@@ -877,8 +877,8 @@ static void pm8001_dev_gone_notify(struct domain_device *dev)
pm8001_dev->device_id, pm8001_dev->dev_type);
if (atomic_read(&pm8001_dev->running_req)) {
spin_unlock_irqrestore(&pm8001_ha->lock, flags);
- pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev ,
- dev, 1, 0);
+ pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev,
+ dev, 1, 0);
while (atomic_read(&pm8001_dev->running_req))
msleep(20);
spin_lock_irqsave(&pm8001_ha->lock, flags);
@@ -1013,8 +1013,8 @@ int pm8001_I_T_nexus_reset(struct domain_device *dev)
goto out;
}
msleep(2000);
- rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev ,
- dev, 1, 0);
+ rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev,
+ dev, 1, 0);
if (rc) {
pm8001_dbg(pm8001_ha, EH, "task abort failed %x\n"
"with rc %d\n", pm8001_dev->device_id, rc);
@@ -1059,8 +1059,8 @@ int pm8001_I_T_nexus_event_handler(struct domain_device *dev)
goto out;
}
/* send internal ssp/sata/smp abort command to FW */
- rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev ,
- dev, 1, 0);
+ rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev,
+ dev, 1, 0);
msleep(100);
/* deregister the target device */
@@ -1075,8 +1075,8 @@ int pm8001_I_T_nexus_event_handler(struct domain_device *dev)
wait_for_completion(&completion_setstate);
} else {
/* send internal ssp/sata/smp abort command to FW */
- rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev ,
- dev, 1, 0);
+ rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev,
+ dev, 1, 0);
msleep(100);
/* deregister the target device */
@@ -1104,8 +1104,8 @@ int pm8001_lu_reset(struct domain_device *dev, u8 *lun)
DECLARE_COMPLETION_ONSTACK(completion_setstate);
if (dev_is_sata(dev)) {
struct sas_phy *phy = sas_get_local_phy(dev);
- rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev ,
- dev, 1, 0);
+ rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev,
+ dev, 1, 0);
rc = sas_phy_reset(phy, 1);
sas_put_local_phy(phy);
pm8001_dev->setds_completion = &completion_setstate;
diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h
index 039ed91..e7f693a 100644
--- a/drivers/scsi/pm8001/pm8001_sas.h
+++ b/drivers/scsi/pm8001/pm8001_sas.h
@@ -705,7 +705,7 @@ int pm8001_mpi_reg_resp(struct pm8001_hba_info *pm8001_ha, void *piomb);
int pm8001_mpi_dereg_resp(struct pm8001_hba_info *pm8001_ha, void *piomb);
int pm8001_mpi_fw_flash_update_resp(struct pm8001_hba_info *pm8001_ha,
void *piomb);
-int pm8001_mpi_general_event(struct pm8001_hba_info *pm8001_ha , void *piomb);
+int pm8001_mpi_general_event(struct pm8001_hba_info *pm8001_ha, void *piomb);
int pm8001_mpi_task_abort_resp(struct pm8001_hba_info *pm8001_ha, void *piomb);
struct sas_task *pm8001_alloc_task(void);
void pm8001_task_done(struct sas_task *task);
diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c
index 8431556..5e02446 100644
--- a/drivers/scsi/pm8001/pm80xx_hwi.c
+++ b/drivers/scsi/pm8001/pm80xx_hwi.c
@@ -90,7 +90,7 @@ ssize_t pm80xx_get_fatal_dump(struct device *cdev,
struct sas_ha_struct *sha = SHOST_TO_SAS_HA(shost);
struct pm8001_hba_info *pm8001_ha = sha->lldd_ha;
void __iomem *fatal_table_address = pm8001_ha->fatal_tbl_addr;
- u32 accum_len , reg_val, index, *temp;
+ u32 accum_len, reg_val, index, *temp;
u32 status = 1;
unsigned long start;
u8 *direct_data;
@@ -1904,7 +1904,7 @@ static void pm80xx_send_read_log(struct pm8001_hba_info *pm8001_ha,
* that the task has been finished.
*/
static void
-mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha , void *piomb)
+mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
{
struct sas_task *t;
struct pm8001_ccb_info *ccb;
@@ -2194,7 +2194,7 @@ mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha , void *piomb)
}
/*See the comments for mpi_ssp_completion */
-static void mpi_ssp_event(struct pm8001_hba_info *pm8001_ha , void *piomb)
+static void mpi_ssp_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
{
struct sas_task *t;
unsigned long flags;
@@ -2444,9 +2444,9 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
(status != IO_UNDERFLOW)) {
if (!((t->dev->parent) &&
(dev_is_expander(t->dev->parent->dev_type)))) {
- for (i = 0 , j = 4; i <= 3 && j <= 7; i++ , j++)
+ for (i = 0, j = 4; i <= 3 && j <= 7; i++, j++)
sata_addr_low[i] = pm8001_ha->sas_addr[j];
- for (i = 0 , j = 0; i <= 3 && j <= 3; i++ , j++)
+ for (i = 0, j = 0; i <= 3 && j <= 3; i++, j++)
sata_addr_hi[i] = pm8001_ha->sas_addr[j];
memcpy(&temp_sata_addr_low, sata_addr_low,
sizeof(sata_addr_low));
@@ -2788,7 +2788,7 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
}
/*See the comments for mpi_ssp_completion */
-static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha , void *piomb)
+static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
{
struct sas_task *t;
struct task_status_struct *ts;
@@ -4918,7 +4918,7 @@ static void mpi_set_phy_profile_req(struct pm8001_hba_info *pm8001_ha,
u32 operation, u32 phyid,
u32 length, u32 *buf)
{
- u32 tag , i, j = 0;
+ u32 tag, i, j = 0;
int rc;
struct set_phy_profile_req payload;
struct inbound_queue_table *circularQ;
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v3 2/2] scsi: pm8001: clean up for open brace
2021-04-08 12:56 [PATCH v3 0/2] scsi: pm8001: tiny clean up patches Luo Jiaxing
2021-04-08 12:56 ` [PATCH v3 1/2] scsi: pm8001: clean up for white space Luo Jiaxing
@ 2021-04-08 12:56 ` Luo Jiaxing
2021-04-09 6:08 ` Jinpu Wang
2021-04-13 3:22 ` [PATCH v3 0/2] scsi: pm8001: tiny clean up patches Martin K. Petersen
2021-04-16 2:51 ` Martin K. Petersen
3 siblings, 1 reply; 7+ messages in thread
From: Luo Jiaxing @ 2021-04-08 12:56 UTC (permalink / raw)
To: jinpu.wang, jejb, martin.petersen
Cc: linux-scsi, linux-kernel, linuxarm, luojiaxing
There are few error about open brace is reported by checkpatch.pl:
ERROR: that open brace { should be on the previous line
+static struct error_fw flash_error_table[] =
+{
So fix them all.
Signed-off-by: Jianqin Xie <xiejianqin@hisilicon.com>
Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
---
drivers/scsi/pm8001/pm8001_ctl.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/pm8001/pm8001_ctl.c b/drivers/scsi/pm8001/pm8001_ctl.c
index 90b816f..8c253b0 100644
--- a/drivers/scsi/pm8001/pm8001_ctl.c
+++ b/drivers/scsi/pm8001/pm8001_ctl.c
@@ -645,8 +645,7 @@ struct flash_command {
int code;
};
-static struct flash_command flash_command_table[] =
-{
+static const struct flash_command flash_command_table[] = {
{"set_nvmd", FLASH_CMD_SET_NVMD},
{"update", FLASH_CMD_UPDATE},
{"", FLASH_CMD_NONE} /* Last entry should be NULL. */
@@ -657,8 +656,7 @@ struct error_fw {
int err_code;
};
-static struct error_fw flash_error_table[] =
-{
+static const struct error_fw flash_error_table[] = {
{"Failed to open fw image file", FAIL_OPEN_BIOS_FILE},
{"image header mismatch", FLASH_UPDATE_HDR_ERR},
{"image offset mismatch", FLASH_UPDATE_OFFSET_ERR},
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] scsi: pm8001: clean up for white space
2021-04-08 12:56 ` [PATCH v3 1/2] scsi: pm8001: clean up for white space Luo Jiaxing
@ 2021-04-09 6:07 ` Jinpu Wang
0 siblings, 0 replies; 7+ messages in thread
From: Jinpu Wang @ 2021-04-09 6:07 UTC (permalink / raw)
To: Luo Jiaxing
Cc: Jinpu Wang, James E.J. Bottomley, Martin K. Petersen,
Linux SCSI Mailinglist, open list, linuxarm
On Thu, Apr 8, 2021 at 2:56 PM Luo Jiaxing <luojiaxing@huawei.com> wrote:
>
> Some errors are found like below when run checkpatch.pl
>
> ERROR: space prohibited before that ',' (ctx:WxW)
> +int pm8001_mpi_general_event(struct pm8001_hba_info *pm8001_ha , void *piomb);
>
> It all about white space, so fix them.
>
> Signed-off-by: Jianqin Xie <xiejianqin@hisilicon.com>
> Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
looks good to me, thx!
Acked-by: Jack Wang <jinpu.wang@ionos.com>
> ---
> drivers/scsi/pm8001/pm8001_ctl.c | 20 +++++++++-----------
> drivers/scsi/pm8001/pm8001_ctl.h | 5 +++++
> drivers/scsi/pm8001/pm8001_hwi.c | 14 +++++++-------
> drivers/scsi/pm8001/pm8001_sas.c | 20 ++++++++++----------
> drivers/scsi/pm8001/pm8001_sas.h | 2 +-
> drivers/scsi/pm8001/pm80xx_hwi.c | 14 +++++++-------
> 6 files changed, 39 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/scsi/pm8001/pm8001_ctl.c b/drivers/scsi/pm8001/pm8001_ctl.c
> index 12035ba..90b816f 100644
> --- a/drivers/scsi/pm8001/pm8001_ctl.c
> +++ b/drivers/scsi/pm8001/pm8001_ctl.c
> @@ -369,24 +369,22 @@ static ssize_t pm8001_ctl_aap_log_show(struct device *cdev,
> struct Scsi_Host *shost = class_to_shost(cdev);
> struct sas_ha_struct *sha = SHOST_TO_SAS_HA(shost);
> struct pm8001_hba_info *pm8001_ha = sha->lldd_ha;
> + u8 *ptr = (u8 *)pm8001_ha->memoryMap.region[AAP1].virt_ptr;
> int i;
> -#define AAP1_MEMMAP(r, c) \
> - (*(u32 *)((u8*)pm8001_ha->memoryMap.region[AAP1].virt_ptr + (r) * 32 \
> - + (c)))
>
> char *str = buf;
> int max = 2;
> for (i = 0; i < max; i++) {
> str += sprintf(str, "0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x"
> "0x%08x 0x%08x\n",
> - AAP1_MEMMAP(i, 0),
> - AAP1_MEMMAP(i, 4),
> - AAP1_MEMMAP(i, 8),
> - AAP1_MEMMAP(i, 12),
> - AAP1_MEMMAP(i, 16),
> - AAP1_MEMMAP(i, 20),
> - AAP1_MEMMAP(i, 24),
> - AAP1_MEMMAP(i, 28));
> + pm8001_ctl_aap1_memmap(ptr, i, 0),
> + pm8001_ctl_aap1_memmap(ptr, i, 4),
> + pm8001_ctl_aap1_memmap(ptr, i, 8),
> + pm8001_ctl_aap1_memmap(ptr, i, 12),
> + pm8001_ctl_aap1_memmap(ptr, i, 16),
> + pm8001_ctl_aap1_memmap(ptr, i, 20),
> + pm8001_ctl_aap1_memmap(ptr, i, 24),
> + pm8001_ctl_aap1_memmap(ptr, i, 28));
> }
>
> return str - buf;
> diff --git a/drivers/scsi/pm8001/pm8001_ctl.h b/drivers/scsi/pm8001/pm8001_ctl.h
> index d0d43a2..4743f0d 100644
> --- a/drivers/scsi/pm8001/pm8001_ctl.h
> +++ b/drivers/scsi/pm8001/pm8001_ctl.h
> @@ -59,5 +59,10 @@
> #define SYSFS_OFFSET 1024
> #define PM80XX_IB_OB_QUEUE_SIZE (32 * 1024)
> #define PM8001_IB_OB_QUEUE_SIZE (16 * 1024)
> +
> +static inline u32 pm8001_ctl_aap1_memmap(u8 *ptr, int idx, int off)
> +{
> + return *(u32 *)(ptr + idx * 32 + off);
> +}
> #endif /* PM8001_CTL_H_INCLUDED */
>
> diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
> index 49bf2f7..6887fa3 100644
> --- a/drivers/scsi/pm8001/pm8001_hwi.c
> +++ b/drivers/scsi/pm8001/pm8001_hwi.c
> @@ -1826,7 +1826,7 @@ static void pm8001_send_read_log(struct pm8001_hba_info *pm8001_ha,
> * that the task has been finished.
> */
> static void
> -mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha , void *piomb)
> +mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
> {
> struct sas_task *t;
> struct pm8001_ccb_info *ccb;
> @@ -2058,7 +2058,7 @@ mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha , void *piomb)
> }
>
> /*See the comments for mpi_ssp_completion */
> -static void mpi_ssp_event(struct pm8001_hba_info *pm8001_ha , void *piomb)
> +static void mpi_ssp_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
> {
> struct sas_task *t;
> unsigned long flags;
> @@ -2294,9 +2294,9 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
> (status != IO_UNDERFLOW)) {
> if (!((t->dev->parent) &&
> (dev_is_expander(t->dev->parent->dev_type)))) {
> - for (i = 0 , j = 4; j <= 7 && i <= 3; i++ , j++)
> + for (i = 0, j = 4; j <= 7 && i <= 3; i++, j++)
> sata_addr_low[i] = pm8001_ha->sas_addr[j];
> - for (i = 0 , j = 0; j <= 3 && i <= 3; i++ , j++)
> + for (i = 0, j = 0; j <= 3 && i <= 3; i++, j++)
> sata_addr_hi[i] = pm8001_ha->sas_addr[j];
> memcpy(&temp_sata_addr_low, sata_addr_low,
> sizeof(sata_addr_low));
> @@ -2625,7 +2625,7 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
> }
>
> /*See the comments for mpi_ssp_completion */
> -static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha , void *piomb)
> +static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
> {
> struct sas_task *t;
> struct task_status_struct *ts;
> @@ -3602,7 +3602,7 @@ int pm8001_mpi_fw_flash_update_resp(struct pm8001_hba_info *pm8001_ha,
> return 0;
> }
>
> -int pm8001_mpi_general_event(struct pm8001_hba_info *pm8001_ha , void *piomb)
> +int pm8001_mpi_general_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
> {
> u32 status;
> int i;
> @@ -3685,7 +3685,7 @@ int pm8001_mpi_task_abort_resp(struct pm8001_hba_info *pm8001_ha, void *piomb)
> * @pm8001_ha: our hba card information
> * @piomb: IO message buffer
> */
> -static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb)
> +static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
> {
> unsigned long flags;
> struct hw_event_resp *pPayload =
> diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
> index a98d449..43b77ac 100644
> --- a/drivers/scsi/pm8001/pm8001_sas.c
> +++ b/drivers/scsi/pm8001/pm8001_sas.c
> @@ -877,8 +877,8 @@ static void pm8001_dev_gone_notify(struct domain_device *dev)
> pm8001_dev->device_id, pm8001_dev->dev_type);
> if (atomic_read(&pm8001_dev->running_req)) {
> spin_unlock_irqrestore(&pm8001_ha->lock, flags);
> - pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev ,
> - dev, 1, 0);
> + pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev,
> + dev, 1, 0);
> while (atomic_read(&pm8001_dev->running_req))
> msleep(20);
> spin_lock_irqsave(&pm8001_ha->lock, flags);
> @@ -1013,8 +1013,8 @@ int pm8001_I_T_nexus_reset(struct domain_device *dev)
> goto out;
> }
> msleep(2000);
> - rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev ,
> - dev, 1, 0);
> + rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev,
> + dev, 1, 0);
> if (rc) {
> pm8001_dbg(pm8001_ha, EH, "task abort failed %x\n"
> "with rc %d\n", pm8001_dev->device_id, rc);
> @@ -1059,8 +1059,8 @@ int pm8001_I_T_nexus_event_handler(struct domain_device *dev)
> goto out;
> }
> /* send internal ssp/sata/smp abort command to FW */
> - rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev ,
> - dev, 1, 0);
> + rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev,
> + dev, 1, 0);
> msleep(100);
>
> /* deregister the target device */
> @@ -1075,8 +1075,8 @@ int pm8001_I_T_nexus_event_handler(struct domain_device *dev)
> wait_for_completion(&completion_setstate);
> } else {
> /* send internal ssp/sata/smp abort command to FW */
> - rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev ,
> - dev, 1, 0);
> + rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev,
> + dev, 1, 0);
> msleep(100);
>
> /* deregister the target device */
> @@ -1104,8 +1104,8 @@ int pm8001_lu_reset(struct domain_device *dev, u8 *lun)
> DECLARE_COMPLETION_ONSTACK(completion_setstate);
> if (dev_is_sata(dev)) {
> struct sas_phy *phy = sas_get_local_phy(dev);
> - rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev ,
> - dev, 1, 0);
> + rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev,
> + dev, 1, 0);
> rc = sas_phy_reset(phy, 1);
> sas_put_local_phy(phy);
> pm8001_dev->setds_completion = &completion_setstate;
> diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h
> index 039ed91..e7f693a 100644
> --- a/drivers/scsi/pm8001/pm8001_sas.h
> +++ b/drivers/scsi/pm8001/pm8001_sas.h
> @@ -705,7 +705,7 @@ int pm8001_mpi_reg_resp(struct pm8001_hba_info *pm8001_ha, void *piomb);
> int pm8001_mpi_dereg_resp(struct pm8001_hba_info *pm8001_ha, void *piomb);
> int pm8001_mpi_fw_flash_update_resp(struct pm8001_hba_info *pm8001_ha,
> void *piomb);
> -int pm8001_mpi_general_event(struct pm8001_hba_info *pm8001_ha , void *piomb);
> +int pm8001_mpi_general_event(struct pm8001_hba_info *pm8001_ha, void *piomb);
> int pm8001_mpi_task_abort_resp(struct pm8001_hba_info *pm8001_ha, void *piomb);
> struct sas_task *pm8001_alloc_task(void);
> void pm8001_task_done(struct sas_task *task);
> diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c
> index 8431556..5e02446 100644
> --- a/drivers/scsi/pm8001/pm80xx_hwi.c
> +++ b/drivers/scsi/pm8001/pm80xx_hwi.c
> @@ -90,7 +90,7 @@ ssize_t pm80xx_get_fatal_dump(struct device *cdev,
> struct sas_ha_struct *sha = SHOST_TO_SAS_HA(shost);
> struct pm8001_hba_info *pm8001_ha = sha->lldd_ha;
> void __iomem *fatal_table_address = pm8001_ha->fatal_tbl_addr;
> - u32 accum_len , reg_val, index, *temp;
> + u32 accum_len, reg_val, index, *temp;
> u32 status = 1;
> unsigned long start;
> u8 *direct_data;
> @@ -1904,7 +1904,7 @@ static void pm80xx_send_read_log(struct pm8001_hba_info *pm8001_ha,
> * that the task has been finished.
> */
> static void
> -mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha , void *piomb)
> +mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
> {
> struct sas_task *t;
> struct pm8001_ccb_info *ccb;
> @@ -2194,7 +2194,7 @@ mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha , void *piomb)
> }
>
> /*See the comments for mpi_ssp_completion */
> -static void mpi_ssp_event(struct pm8001_hba_info *pm8001_ha , void *piomb)
> +static void mpi_ssp_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
> {
> struct sas_task *t;
> unsigned long flags;
> @@ -2444,9 +2444,9 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
> (status != IO_UNDERFLOW)) {
> if (!((t->dev->parent) &&
> (dev_is_expander(t->dev->parent->dev_type)))) {
> - for (i = 0 , j = 4; i <= 3 && j <= 7; i++ , j++)
> + for (i = 0, j = 4; i <= 3 && j <= 7; i++, j++)
> sata_addr_low[i] = pm8001_ha->sas_addr[j];
> - for (i = 0 , j = 0; i <= 3 && j <= 3; i++ , j++)
> + for (i = 0, j = 0; i <= 3 && j <= 3; i++, j++)
> sata_addr_hi[i] = pm8001_ha->sas_addr[j];
> memcpy(&temp_sata_addr_low, sata_addr_low,
> sizeof(sata_addr_low));
> @@ -2788,7 +2788,7 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
> }
>
> /*See the comments for mpi_ssp_completion */
> -static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha , void *piomb)
> +static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
> {
> struct sas_task *t;
> struct task_status_struct *ts;
> @@ -4918,7 +4918,7 @@ static void mpi_set_phy_profile_req(struct pm8001_hba_info *pm8001_ha,
> u32 operation, u32 phyid,
> u32 length, u32 *buf)
> {
> - u32 tag , i, j = 0;
> + u32 tag, i, j = 0;
> int rc;
> struct set_phy_profile_req payload;
> struct inbound_queue_table *circularQ;
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 2/2] scsi: pm8001: clean up for open brace
2021-04-08 12:56 ` [PATCH v3 2/2] scsi: pm8001: clean up for open brace Luo Jiaxing
@ 2021-04-09 6:08 ` Jinpu Wang
0 siblings, 0 replies; 7+ messages in thread
From: Jinpu Wang @ 2021-04-09 6:08 UTC (permalink / raw)
To: Luo Jiaxing
Cc: Jinpu Wang, James E.J. Bottomley, Martin K. Petersen,
Linux SCSI Mailinglist, open list, linuxarm
On Thu, Apr 8, 2021 at 2:56 PM Luo Jiaxing <luojiaxing@huawei.com> wrote:
>
> There are few error about open brace is reported by checkpatch.pl:
>
> ERROR: that open brace { should be on the previous line
> +static struct error_fw flash_error_table[] =
> +{
>
> So fix them all.
>
> Signed-off-by: Jianqin Xie <xiejianqin@hisilicon.com>
> Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
looks good to me, thx!
Acked-by: Jack Wang <jinpu.wang@ionos.com>
> ---
> drivers/scsi/pm8001/pm8001_ctl.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/pm8001/pm8001_ctl.c b/drivers/scsi/pm8001/pm8001_ctl.c
> index 90b816f..8c253b0 100644
> --- a/drivers/scsi/pm8001/pm8001_ctl.c
> +++ b/drivers/scsi/pm8001/pm8001_ctl.c
> @@ -645,8 +645,7 @@ struct flash_command {
> int code;
> };
>
> -static struct flash_command flash_command_table[] =
> -{
> +static const struct flash_command flash_command_table[] = {
> {"set_nvmd", FLASH_CMD_SET_NVMD},
> {"update", FLASH_CMD_UPDATE},
> {"", FLASH_CMD_NONE} /* Last entry should be NULL. */
> @@ -657,8 +656,7 @@ struct error_fw {
> int err_code;
> };
>
> -static struct error_fw flash_error_table[] =
> -{
> +static const struct error_fw flash_error_table[] = {
> {"Failed to open fw image file", FAIL_OPEN_BIOS_FILE},
> {"image header mismatch", FLASH_UPDATE_HDR_ERR},
> {"image offset mismatch", FLASH_UPDATE_OFFSET_ERR},
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 0/2] scsi: pm8001: tiny clean up patches
2021-04-08 12:56 [PATCH v3 0/2] scsi: pm8001: tiny clean up patches Luo Jiaxing
2021-04-08 12:56 ` [PATCH v3 1/2] scsi: pm8001: clean up for white space Luo Jiaxing
2021-04-08 12:56 ` [PATCH v3 2/2] scsi: pm8001: clean up for open brace Luo Jiaxing
@ 2021-04-13 3:22 ` Martin K. Petersen
2021-04-16 2:51 ` Martin K. Petersen
3 siblings, 0 replies; 7+ messages in thread
From: Martin K. Petersen @ 2021-04-13 3:22 UTC (permalink / raw)
To: Luo Jiaxing
Cc: jinpu.wang, jejb, martin.petersen, linux-scsi, linux-kernel, linuxarm
Luo,
> Several error is reported by checkpatch.pl, here are two patches to clean
> them up.
Applied to 5.13/scsi-staging, thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 0/2] scsi: pm8001: tiny clean up patches
2021-04-08 12:56 [PATCH v3 0/2] scsi: pm8001: tiny clean up patches Luo Jiaxing
` (2 preceding siblings ...)
2021-04-13 3:22 ` [PATCH v3 0/2] scsi: pm8001: tiny clean up patches Martin K. Petersen
@ 2021-04-16 2:51 ` Martin K. Petersen
3 siblings, 0 replies; 7+ messages in thread
From: Martin K. Petersen @ 2021-04-16 2:51 UTC (permalink / raw)
To: Luo Jiaxing, jejb, jinpu.wang
Cc: Martin K . Petersen, linux-kernel, linuxarm, linux-scsi
On Thu, 8 Apr 2021 20:56:31 +0800, Luo Jiaxing wrote:
> Several error is reported by checkpatch.pl, here are two patches to clean
> them up.
Applied to 5.13/scsi-queue, thanks!
[1/2] scsi: pm8001: clean up for white space
https://git.kernel.org/mkp/scsi/c/8a23dbc60089
[2/2] scsi: pm8001: clean up for open brace
https://git.kernel.org/mkp/scsi/c/fa5ac2beabad
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-04-16 2:52 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-08 12:56 [PATCH v3 0/2] scsi: pm8001: tiny clean up patches Luo Jiaxing
2021-04-08 12:56 ` [PATCH v3 1/2] scsi: pm8001: clean up for white space Luo Jiaxing
2021-04-09 6:07 ` Jinpu Wang
2021-04-08 12:56 ` [PATCH v3 2/2] scsi: pm8001: clean up for open brace Luo Jiaxing
2021-04-09 6:08 ` Jinpu Wang
2021-04-13 3:22 ` [PATCH v3 0/2] scsi: pm8001: tiny clean up patches Martin K. Petersen
2021-04-16 2:51 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).