[tip:perf/core] perf script: Kill script_spec__delete

From: tip-bot for Namhyung Kim
Date: Wed Jan 04 2012 - 10:23:13 EST


Commit-ID: 466e2876bcb9ddc9b92502c46689679bee7d72a0
Gitweb: http://git.kernel.org/tip/466e2876bcb9ddc9b92502c46689679bee7d72a0
Author: Namhyung Kim <namhyung@xxxxxxxxx>
AuthorDate: Wed, 28 Dec 2011 00:35:51 +0900
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Tue, 3 Jan 2012 15:06:34 -0200

perf script: Kill script_spec__delete

As script_spec__delete() frees given struct script_spec it should not be
called if we failed to allocate the struct. Also it's the only caller of
the function, we can get rid of the function itself.

Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Link: http://lkml.kernel.org/r/1325000151-4463-4-git-send-email-namhyung@xxxxxxxxx
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/builtin-script.c | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 3d4c0c7..fd1909a 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -536,12 +536,6 @@ static struct script_spec *script_spec__new(const char *spec,
return s;
}

-static void script_spec__delete(struct script_spec *s)
-{
- free(s->spec);
- free(s);
-}
-
static void script_spec__add(struct script_spec *s)
{
list_add_tail(&s->node, &script_specs);
@@ -567,16 +561,11 @@ static struct script_spec *script_spec__findnew(const char *spec,

s = script_spec__new(spec, ops);
if (!s)
- goto out_delete_spec;
+ return NULL;

script_spec__add(s);

return s;
-
-out_delete_spec:
- script_spec__delete(s);
-
- return NULL;
}

int script_spec_register(const char *spec, struct scripting_ops *ops)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/