[PATCH] EDAC: Use kcalloc()
From: Borislav Petkov
Date: Tue Apr 12 2022 - 19:26:41 EST
From: Borislav Petkov <bp@xxxxxxx>
It is syntactic sugar anyway:
# drivers/edac/edac_mc.o:
text data bss dec hex filename
13378 324 8 13710 358e edac_mc.o.before
13378 324 8 13710 358e edac_mc.o.after
md5:
70a53ee3ac7f867730e35c2be9110748 edac_mc.o.before.asm
70a53ee3ac7f867730e35c2be9110748 edac_mc.o.after.asm
# drivers/edac/edac_device.o:
text data bss dec hex filename
5684 120 4 5808 16b0 edac_device.o.before
5684 120 4 5808 16b0 edac_device.o.after
md5:
811325c80acb5a1d6df7b290df3e1636 edac_device.o.before.asm
811325c80acb5a1d6df7b290df3e1636 edac_device.o.after.asm
No functional changes.
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
---
drivers/edac/edac_device.c | 9 +++------
drivers/edac/edac_mc.c | 2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index b737349184e3..3d5a4944735f 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -70,9 +70,7 @@ edac_device_alloc_ctl_info(unsigned pvt_sz, char *dev_name, unsigned nr_instance
if (!dev_ctl)
return NULL;
- dev_inst = kmalloc_array(nr_instances,
- sizeof(struct edac_device_instance),
- GFP_KERNEL | __GFP_ZERO);
+ dev_inst = kcalloc(nr_instances, sizeof(struct edac_device_instance), GFP_KERNEL);
if (!dev_inst)
goto free;
@@ -87,9 +85,8 @@ edac_device_alloc_ctl_info(unsigned pvt_sz, char *dev_name, unsigned nr_instance
dev_ctl->blocks = dev_blk;
if (nr_attrib) {
- dev_attrib = kmalloc_array(nr_attrib,
- sizeof(struct edac_dev_sysfs_block_attribute),
- GFP_KERNEL | __GFP_ZERO);
+ dev_attrib = kcalloc(nr_attrib, sizeof(struct edac_dev_sysfs_block_attribute),
+ GFP_KERNEL);
if (!dev_attrib)
goto free;
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 387b6851c975..eb58644bb019 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -366,7 +366,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num,
if (!mci)
return NULL;
- mci->layers = kmalloc_array(n_layers, sizeof(struct edac_mc_layer), GFP_KERNEL | __GFP_ZERO);
+ mci->layers = kcalloc(n_layers, sizeof(struct edac_mc_layer), GFP_KERNEL);
if (!mci->layers)
goto error;
--
2.35.1