[U-Boot] [PATCH 1/6] sf: ops: Squash the malloc+memset combo
Squash the malloc()+memset() combo in favor of calloc().
Signed-off-by: Jagannadha Sutradharudu Teki jaganna@xilinx.com Cc: Marek Vasut marex@denx.de --- drivers/mtd/spi/sf_ops.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 1f1bb36..1fac63a 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -381,8 +381,11 @@ 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); + if (!cmd) { + printf("SF: Failed to allocate cmd\n"); + return ret; + }
cmd[0] = flash->read_cmd; while (len) {
On Saturday, January 18, 2014 at 09:06:28 PM, Jagannadha Sutradharudu Teki wrote:
Squash the malloc()+memset() combo in favor of calloc().
Signed-off-by: Jagannadha Sutradharudu Teki jaganna@xilinx.com Cc: Marek Vasut marex@denx.de
drivers/mtd/spi/sf_ops.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 1f1bb36..1fac63a 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -381,8 +381,11 @@ 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);
- if (!cmd) {
printf("SF: Failed to allocate cmd\n");
Usually if your memory allocation fails on 4 bytes of data, the printf() here will not happen either :) Just use debug().
btw. if you use printf() without args, rather use puts()
return ret;}
cmd[0] = flash->read_cmd; while (len) {
Best regards, Marek Vasut
participants (2)
-
Jagannadha Sutradharudu Teki -
Marek Vasut