2020-04-03 16:53:35

by Alex Dewar

Subject: [PATCH] scsi: aic7xxx: Use kzalloc() instead of kmalloc()+memset()

There are a couple of places where kzalloc() could be used directly
instead of calling kmalloc() then memset(). Replace them.

Signed-off-by: Alex Dewar <[email protected]>
---
drivers/scsi/aic7xxx/aic79xx_core.c | 3 +--
drivers/scsi/aic7xxx/aic7xxx_core.c | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index a336a458c978..c38163707259 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -6054,14 +6054,13 @@ ahd_alloc(void *platform_arg, char *name)
{
struct ahd_softc *ahd;

- ahd = kmalloc(sizeof(*ahd), GFP_ATOMIC);
+ ahd = kzalloc(sizeof(*ahd), GFP_ATOMIC);
if (!ahd) {
printk("aic7xxx: cannot malloc softc!\n");
kfree(name);
return NULL;
}

- memset(ahd, 0, sizeof(*ahd));
ahd->seep_config = kmalloc(sizeof(*ahd->seep_config), GFP_ATOMIC);
if (ahd->seep_config == NULL) {
kfree(ahd);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 84fc499cb1e6..36a7ea1ba7da 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -4384,13 +4384,13 @@ ahc_alloc(void *platform_arg, char *name)
struct ahc_softc *ahc;
int i;

- ahc = kmalloc(sizeof(*ahc), GFP_ATOMIC);
+ ahc = kzalloc(sizeof(*ahc), GFP_ATOMIC);
if (!ahc) {
printk("aic7xxx: cannot malloc softc!\n");
kfree(name);
return NULL;
}
- memset(ahc, 0, sizeof(*ahc));
+
ahc->seep_config = kmalloc(sizeof(*ahc->seep_config), GFP_ATOMIC);
if (ahc->seep_config == NULL) {
kfree(ahc);
--
2.26.0

2020-04-24 16:52:24

by Martin K. Petersen

Subject: Re: [PATCH] scsi: aic7xxx: Use kzalloc() instead of kmalloc()+memset()

Alex,

> There are a couple of places where kzalloc() could be used directly
> instead of calling kmalloc() then memset(). Replace them.

Applied to 5.8/scsi-queue, thanks!

--
Martin K. Petersen Oracle Linux Engineering