Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3a816054fcd345d0fe47c666c375d372c6170371

Authored by Joe Perches
Committed by Jiri Kosina
1 parent dc8a5c9935
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

atm: Convert vmalloc/memset to vzalloc 

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

Showing 2 changed files with 7 additions and 7 deletions Side-by-side Diff

drivers/atm/idt77252.c
Diff comments   View file @ 3a81605
... ... @@ -3416,27 +3416,28 @@
3416 3416  
3417 3417 size = sizeof(struct vc_map *) * card->tct_size;
3418 3418 IPRINTK("%s: allocate %d byte for VC map.\n", card->name, size);
3419   - if (NULL == (card->vcs = vmalloc(size))) {
  3419 + card->vcs = vzalloc(size);
  3420 + if (!card->vcs) {
3420 3421 printk("%s: memory allocation failure.\n", card->name);
3421 3422 deinit_card(card);
3422 3423 return -1;
3423 3424 }
3424   - memset(card->vcs, 0, size);
3425 3425  
3426 3426 size = sizeof(struct vc_map *) * card->scd_size;
3427 3427 IPRINTK("%s: allocate %d byte for SCD to VC mapping.\n",
3428 3428 card->name, size);
3429   - if (NULL == (card->scd2vc = vmalloc(size))) {
  3429 + card->scd2vc = vzalloc(size);
  3430 + if (!card->scd2vc) {
3430 3431 printk("%s: memory allocation failure.\n", card->name);
3431 3432 deinit_card(card);
3432 3433 return -1;
3433 3434 }
3434   - memset(card->scd2vc, 0, size);
3435 3435  
3436 3436 size = sizeof(struct tst_info) * (card->tst_size - 2);
3437 3437 IPRINTK("%s: allocate %d byte for TST to VC mapping.\n",
3438 3438 card->name, size);
3439   - if (NULL == (card->soft_tst = vmalloc(size))) {
  3439 + card->soft_tst = vmalloc(size);
  3440 + if (!card->soft_tst) {
3440 3441 printk("%s: memory allocation failure.\n", card->name);
3441 3442 deinit_card(card);
3442 3443 return -1;
... ... @@ -1457,10 +1457,9 @@
1457 1457 return (lanai->vccs == NULL) ? -ENOMEM : 0;
1458 1458 #else
1459 1459 int bytes = (lanai->num_vci) * sizeof(struct lanai_vcc *);
1460   - lanai->vccs = (struct lanai_vcc **) vmalloc(bytes);
  1460 + lanai->vccs = vzalloc(bytes);
1461 1461 if (unlikely(lanai->vccs == NULL))
1462 1462 return -ENOMEM;
1463   - memset(lanai->vccs, 0, bytes);
1464 1463 return 0;
1465 1464 #endif
1466 1465 }