* [PATCH] EDAC: Use kcalloc()
@ 2022-04-12 21:19 Borislav Petkov
2022-05-02 9:24 ` [PATCH v2] " Borislav Petkov
0 siblings, 1 reply; 2+ messages in thread
From: Borislav Petkov @ 2022-04-12 21:19 UTC (permalink / raw)
To: linux-edac; +Cc: LKML, kernel test robot
From: Borislav Petkov <bp@suse.de>
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@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v2] EDAC: Use kcalloc()
2022-04-12 21:19 [PATCH] EDAC: Use kcalloc() Borislav Petkov
@ 2022-05-02 9:24 ` Borislav Petkov
0 siblings, 0 replies; 2+ messages in thread
From: Borislav Petkov @ 2022-05-02 9:24 UTC (permalink / raw)
To: linux-edac; +Cc: LKML, kernel test robot
On Tue, Apr 12, 2022 at 11:19:57PM +0200, Borislav Petkov wrote:
v2 with one forgotten instance converted:
---
From: Borislav Petkov <bp@suse.de>
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
5704 120 4 5828 16c4 edac_device.o.before
5704 120 4 5828 16c4 edac_device.o.after
md5:
880563c859da6eb9aca85ec431fdbaeb edac_device.o.before.asm
880563c859da6eb9aca85ec431fdbaeb edac_device.o.after.asm
No functional changes.
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
---
drivers/edac/edac_device.c | 13 ++++---------
drivers/edac/edac_mc.c | 2 +-
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index b737349184e3..19522c568aa5 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -70,26 +70,21 @@ 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;
dev_ctl->instances = dev_inst;
- dev_blk = kmalloc_array(nr_instances * nr_blocks,
- sizeof(struct edac_device_block),
- GFP_KERNEL | __GFP_ZERO);
+ dev_blk = kcalloc(nr_instances * nr_blocks, sizeof(struct edac_device_block), GFP_KERNEL);
if (!dev_blk)
goto free;
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
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-02 9:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-12 21:19 [PATCH] EDAC: Use kcalloc() Borislav Petkov
2022-05-02 9:24 ` [PATCH v2] " Borislav Petkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox