Re: [PATCH 1/2] ia64: Use ARRAY_SIZE to replace its implementation
From: zhong jiang <hidden>
Date: 2018-08-14 04:57:17
Also in:
lkml
On 2018/8/14 12:45, Joe Perches wrote:
quoted hunk ↗ jump to hunk
On Tue, 2018-08-14 at 10:46 +0800, zhong jiang wrote:quoted
We prefer to ARRAY_SIZE rather than duplicating its implementation. So just replace it.[]quoted
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c[]quoted
@@ -4645,7 +4645,7 @@ static char *pfmfs_dname(struct dentry *dentry, char *buffer, int buflen) /* 32 */PFM_CMD(pfm_write_ibrs, PFM_CMD_PCLRWS, PFM_CMD_ARG_MANY, pfarg_dbreg_t, NULL), /* 33 */PFM_CMD(pfm_write_dbrs, PFM_CMD_PCLRWS, PFM_CMD_ARG_MANY, pfarg_dbreg_t, NULL) }; -#define PFM_CMD_COUNT (sizeof(pfm_cmd_tab)/sizeof(pfm_cmd_desc_t)) +#define PFM_CMD_COUNT ARRAY_SIZE(pfm_cmd_tab)Better would be to remove the #define altogether and change the one place where it's used to ARRAY_SIZE(...) --- arch/ia64/kernel/perfmon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index a9d4dc6c0427..08ece2c7b6e1 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c@@ -4645,7 +4645,6 @@ static pfm_cmd_desc_t pfm_cmd_tab[]={ /* 32 */PFM_CMD(pfm_write_ibrs, PFM_CMD_PCLRWS, PFM_CMD_ARG_MANY, pfarg_dbreg_t, NULL), /* 33 */PFM_CMD(pfm_write_dbrs, PFM_CMD_PCLRWS, PFM_CMD_ARG_MANY, pfarg_dbreg_t, NULL) }; -#define PFM_CMD_COUNT (sizeof(pfm_cmd_tab)/sizeof(pfm_cmd_desc_t)) static int pfm_check_task_state(pfm_context_t *ctx, int cmd, unsigned long flags)@@ -4770,7 +4769,7 @@ sys_perfmonctl (int fd, int cmd, void __user *arg, int count) */ if (unlikely(pmu_conf == NULL)) return -ENOSYS; - if (unlikely(cmd < 0 || cmd >= PFM_CMD_COUNT)) { + if (unlikely(cmd < 0 || cmd >= ARRAY_SIZE(pfm_cmd_tab)) { DPRINT(("invalid cmd=%d\n", cmd)); return -EINVAL; }.
Thank you for suggestion. That's indeed better if just one palce use it. I will repost in v2. Sincerely, zhong jiang