| Message ID | 9e839652-bcb9-45d6-95c5-ebd5b2ec0998@AM1EHSMHS010.ehs.local |
|---|---|
| State | Superseded |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
On Friday, January 17, 2014 at 03:41:45 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 | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c > index 1f1bb36..9650486 100644 > --- a/drivers/mtd/spi/sf_ops.c > +++ b/drivers/mtd/spi/sf_ops.c > @@ -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 ;-) ) > while (len) { Best regards, Marek Vasut
On Fri, Jan 17, 2014 at 8:13 PM, Marek Vasut <marex@denx.de> wrote: > On Friday, January 17, 2014 at 03:41:45 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 | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c >> index 1f1bb36..9650486 100644 >> --- a/drivers/mtd/spi/sf_ops.c >> +++ b/drivers/mtd/spi/sf_ops.c >> @@ -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 ;-) ) > Yes - will take care that. thanks!
diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 1f1bb36..9650486 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -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) {
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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)