Skip to contentSkip to conversation

sf: ops: Squash the malloc+memset combo

PATCH New Jagannadha Sutradharudu Teki 3 participants 3 messages Jan 17, 2014 Memory technology devices (MTD)

lore
Share & tools
lore

Jagannadha Sutradharudu Teki

author
#0 lore raw

PATCH 1/3 sf: ops: Squash the malloc+memset combo

Squash the malloc()+memset() combo in favor of calloc().

Signed-off-by Jagannadha Sutradharudu Teki <[email protected]>
Cc Marek Vasut <[email protected]>
---
 drivers/mtd/spi/sf_ops.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/mtd/spi/sf_ops.c +1 -2
index 1f1bb36..9650486 100644
@@ -381,8 +381,7 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
 	}
 
 	cmdsz = SPI_FLASH_CMD_LEN + flash->dummy_byte;
-	cmd = malloc(cmdsz);
-	memset(cmd, 0, cmdsz);
+	cmd = calloc(1, cmdsz);
 
 	cmd[0] = flash->read_cmd;
 	while (len) {
Signature · 1 line
1.8.3
#1 lore raw

PATCH 1/3 sf: ops: Squash the malloc+memset combo

Quoted 13 lines · Jagannadha Sutradharudu Teki

Squash the malloc()+memset() combo in favor of calloc().

Signed-off-by Jagannadha Sutradharudu Teki <[email protected]>
Cc Marek Vasut <[email protected]>
---
 drivers/mtd/spi/sf_ops.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/mtd/spi/sf_ops.c +0 -0
index 1f1bb36..9650486 100644

drivers/mtd/spi/sf_ops.c int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 · line 386

Quoted 8 lines
drivers/mtd/spi/sf_ops.c +1 -2
@@ -381,8 +381,7 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32
 offset, }
 
 	cmdsz = SPI_FLASH_CMD_LEN + flash->dummy_byte;
-	cmd = malloc(cmdsz);
-	memset(cmd, 0, cmdsz);
+	cmd = calloc(1, cmdsz);
 
 	cmd[0] = flash->read_cmd;

What exactly will happen here when calloc() fails ? :-)

(that means, please check the return value ;-) )

drivers/mtd/spi/sf_ops.c int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, · line 387

Quoted 1 line
drivers/mtd/spi/sf_ops.c +0 -0
 	while (len) {

Best regards,
Marek Vasut

#2 lore raw

PATCH 1/3 sf: ops: Squash the malloc+memset combo

Quoted 21 lines · Marek Vasut
Quoted 20 lines · Jagannadha Sutradharudu Teki

Squash the malloc()+memset() combo in favor of calloc().

Signed-off-by Jagannadha Sutradharudu Teki <[email protected]>
Cc Marek Vasut <[email protected]>
---
 drivers/mtd/spi/sf_ops.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/mtd/spi/sf_ops.c +1 -2
index 1f1bb36..9650486 100644
@@ -381,8 +381,7 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32
 offset, }
 
      cmdsz = SPI_FLASH_CMD_LEN + flash->dummy_byte;
-     cmd = malloc(cmdsz);
-     memset(cmd, 0, cmdsz);
+     cmd = calloc(1, cmdsz);
Quoted 6 lines

drivers/mtd/spi/sf_ops.c int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, · line 386

Quoted 1 line
drivers/mtd/spi/sf_ops.c +0 -0
      cmd[0] = flash->read_cmd;

What exactly will happen here when calloc() fails ? :-)

(that means, please check the return value ;-) )

Yes - will take care that. thanks!

Signature · 1 line
Jagan.