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>

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 14cea7463a621b33c6c0b8487781db107d764841..4dd37552abc2cb5c4ba4afd6b3a70c6c3dfebdfe 100644 (file)
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -330,10 +330,10 @@ static void set_subtitle(void)
        list_for_each_entry(sp, &trail, entries) {
                if (sp->text) {
                        if (pos) {
-                               pos->next = xcalloc(sizeof(*pos), 1);
+                               pos->next = xcalloc(1, sizeof(*pos));
                                pos = pos->next;
                        } else {
-                               subtitles = pos = xcalloc(sizeof(*pos), 1);
+                               subtitles = pos = xcalloc(1, sizeof(*pos));
                        }
                        pos->text = sp->text;
                }

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 2af18376b0772ea5094e1f6277afa343533a484c..dc0d095f318c7da2868352d5a4c048a5dde40251 100644 (file)
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -162,8 +162,8 @@ static int __hpp__sort(struct hist_entry *a, struct hist_entry *b,
                return ret;
 
        nr_members = evsel->nr_members;
-       fields_a = calloc(sizeof(*fields_a), nr_members);
-       fields_b = calloc(sizeof(*fields_b), nr_members);
+       fields_a = calloc(nr_members, sizeof(*fields_a));
+       fields_b = calloc(nr_members, sizeof(*fields_b));
 
        if (!fields_a || !fields_b)
                goto out;

diff --git a/tools/thermal/tmon/sysfs.c b/tools/thermal/tmon/sysfs.c
index dfe454855cd2e7a2699fd6025ab40bacb1455447..1c12536f2081e89a5f112c39cf3aa4716bd7dc94 100644 (file)
--- a/tools/thermal/tmon/sysfs.c
+++ b/tools/thermal/tmon/sysfs.c
@@ -446,7 +446,7 @@ int probe_thermal_sysfs(void)
                return -1;
        }
 
-       ptdata.tzi = calloc(sizeof(struct tz_info), ptdata.max_tz_instance+1);
+       ptdata.tzi = calloc(ptdata.max_tz_instance+1, sizeof(struct tz_info));
        if (!ptdata.tzi) {
                fprintf(stderr, "Err: allocate tz_info\n");
                return -1;
@@ -454,8 +454,8 @@ int probe_thermal_sysfs(void)
 
        /* we still show thermal zone information if there is no cdev */
        if (ptdata.nr_cooling_dev) {
-               ptdata.cdi = calloc(sizeof(struct cdev_info),
-                               ptdata.max_cdev_instance + 1);
+               ptdata.cdi = calloc(ptdata.max_cdev_instance + 1,
+                               sizeof(struct cdev_info));
                if (!ptdata.cdi) {
                        free(ptdata.tzi);
                        fprintf(stderr, "Err: allocate cdev_info\n");