Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030475Ab3FTSdy (ORCPT ); Thu, 20 Jun 2013 14:33:54 -0400 Received: from mga01.intel.com ([192.55.52.88]:28545 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161086Ab3FTSbr (ORCPT ); Thu, 20 Jun 2013 14:31:47 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,906,1363158000"; d="scan'208";a="356919739" From: Tom Zanussi To: rostedt@goodmis.org Cc: masami.hiramatsu.pt@hitachi.com, linux-kernel@vger.kernel.org, Tom Zanussi Subject: [PATCH 01/11] tracing: simplify event_enable_read() Date: Thu, 20 Jun 2013 13:31:25 -0500 Message-Id: <5e57e22fc06131f05c010c044680d56b6d7dc3c9.1371751701.git.tom.zanussi@linux.intel.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1546 Lines: 49 Rather than enumerating each permutation, build the enable state string up from the combination of states. This also allows for the simpler addition of more states. Signed-off-by: Tom Zanussi --- kernel/trace/trace_events.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 27963e2..ecb2609 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -624,17 +624,17 @@ event_enable_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *ppos) { struct ftrace_event_file *file = filp->private_data; - char *buf; + char buf[4] = "0"; - if (file->flags & FTRACE_EVENT_FL_ENABLED) { - if (file->flags & FTRACE_EVENT_FL_SOFT_DISABLED) - buf = "0*\n"; - else if (file->flags & FTRACE_EVENT_FL_SOFT_MODE) - buf = "1*\n"; - else - buf = "1\n"; - } else - buf = "0\n"; + if (file->flags & FTRACE_EVENT_FL_ENABLED && + !(file->flags & FTRACE_EVENT_FL_SOFT_DISABLED)) + strcpy(buf, "1"); + + if (file->flags & FTRACE_EVENT_FL_SOFT_DISABLED || + file->flags & FTRACE_EVENT_FL_SOFT_MODE) + strcat(buf, "*"); + + strcat(buf, "\n"); return simple_read_from_buffer(ubuf, cnt, ppos, buf, strlen(buf)); } -- 1.7.11.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/