Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit e4e458b45c5861808674eebfea94cee2258bb2ea

Authored by Arjun Sreedharan
Committed by Arnaldo Carvalho de Melo
1 parent 2e77784bb7
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

calloc/xcalloc: Fix argument order 

The calloc() and xcalloc() functions takes @nmemb first and then @size.  Fix all w/
pattern "calloc\s*(\s*sizeof".

Signed-off-by: Arjun Sreedharan <arjun024@gmail.com>
Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1417866043-1877-1-git-send-email-arjun024@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

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

scripts/kconfig/mconf.c
Diff comments   View file @ e4e458b
... ... @@ -330,10 +330,10 @@
330 330 list_for_each_entry(sp, &trail, entries) {
331 331 if (sp->text) {
332 332 if (pos) {
333   - pos->next = xcalloc(sizeof(*pos), 1);
  333 + pos->next = xcalloc(1, sizeof(*pos));
334 334 pos = pos->next;
335 335 } else {
336   - subtitles = pos = xcalloc(sizeof(*pos), 1);
  336 + subtitles = pos = xcalloc(1, sizeof(*pos));
337 337 }
338 338 pos->text = sp->text;
339 339 }
tools/perf/ui/hist.c
Diff comments   View file @ e4e458b
... ... @@ -162,8 +162,8 @@
162 162 return ret;
163 163  
164 164 nr_members = evsel->nr_members;
165   - fields_a = calloc(sizeof(*fields_a), nr_members);
166   - fields_b = calloc(sizeof(*fields_b), nr_members);
  165 + fields_a = calloc(nr_members, sizeof(*fields_a));
  166 + fields_b = calloc(nr_members, sizeof(*fields_b));
167 167  
168 168 if (!fields_a || !fields_b)
169 169 goto out;
tools/thermal/tmon/sysfs.c
Diff comments   View file @ e4e458b
... ... @@ -446,7 +446,7 @@
446 446 return -1;
447 447 }
448 448  
449   - ptdata.tzi = calloc(sizeof(struct tz_info), ptdata.max_tz_instance+1);
  449 + ptdata.tzi = calloc(ptdata.max_tz_instance+1, sizeof(struct tz_info));
450 450 if (!ptdata.tzi) {
451 451 fprintf(stderr, "Err: allocate tz_info\n");
452 452 return -1;
... ... @@ -454,8 +454,8 @@
454 454  
455 455 /* we still show thermal zone information if there is no cdev */
456 456 if (ptdata.nr_cooling_dev) {
457   - ptdata.cdi = calloc(sizeof(struct cdev_info),
458   - ptdata.max_cdev_instance + 1);
  457 + ptdata.cdi = calloc(ptdata.max_cdev_instance + 1,
  458 + sizeof(struct cdev_info));
459 459 if (!ptdata.cdi) {
460 460 free(ptdata.tzi);
461 461 fprintf(stderr, "Err: allocate cdev_info\n");