From patchwork Mon Feb 1 07:58:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 60870 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp2869105lbb; Mon, 1 Feb 2016 00:01:39 -0800 (PST) X-Received: by 10.98.13.150 with SMTP id 22mr35898992pfn.143.1454313699692; Mon, 01 Feb 2016 00:01:39 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xu3si22660686pab.94.2016.02.01.00.01.39; Mon, 01 Feb 2016 00:01:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752170AbcBAIBh (ORCPT + 30 others); Mon, 1 Feb 2016 03:01:37 -0500 Received: from mail-pf0-f179.google.com ([209.85.192.179]:34585 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751490AbcBAIAC (ORCPT ); Mon, 1 Feb 2016 03:00:02 -0500 Received: by mail-pf0-f179.google.com with SMTP id o185so74578462pfb.1 for ; Mon, 01 Feb 2016 00:00:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=f733EETAzF8qfBJJSjhFbEY8DPyinVAzvIQ7/GZG+0w=; b=RqnaAGfEkNogTioD5IgD5pOMTevGnwGOpWSoKVMs0JrfkuSMLNEnqtsgsQpFEOLRkf ch2vqDWxOqsOaaGEg2cxJdi8Lhm0AsCPR1eFU0oWS9Oi6ffs967YQoiqVehXVxqnaTmE kR8HD3UrfQPDNDzBPLTqyuUTNNXHiZjnfQb68= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=f733EETAzF8qfBJJSjhFbEY8DPyinVAzvIQ7/GZG+0w=; b=bd1fxEVC9JcDmhBM+hlC7ah0MY6XgoXbBqdeQhjo71MTTQLemnyXsyxbjifck2xecK SaRZZG8yL2w0AMNHIrEztypuyw0TMpqkDWFFMom4Pk1KMyKQxXq2XlB9G+E6IHF0GxcO 1PazUtfZ4P+R1fXc0JQZPTHYnYEUgygbdYHH8AUbqq9DoDUwrBoYkRUCFPQJBmZsF8VD ZWGHhgRA6Wy7RT9mbk5cVTXYLcM60AePu15rdobPx8gN1sf3l9YNNnvoM/wVJ5puqV/4 qWtjNvg066YzmB4Mh4oHXvRHyB6vulbIPeJ6ZVTlQhOaQvxnVQR4Z7L1R7B5xYXH/9hg kblA== X-Gm-Message-State: AG10YORbTdKHdvrTlAnGXAWX0EsZAABd0SWIo7uSkqpiE0bFpT2DVo/E6JSNQ4w0qLXNjUqh X-Received: by 10.98.17.208 with SMTP id 77mr35354726pfr.37.1454313602430; Mon, 01 Feb 2016 00:00:02 -0800 (PST) Received: from zcy-ubuntu.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id o4sm40799282pfa.85.2016.01.31.23.59.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Feb 2016 00:00:01 -0800 (PST) From: Chunyan Zhang To: mathieu.poirier@linaro.org, alexander.shishkin@linux.intel.com Cc: robh@kernel.org, broonie@kernel.org, pratikp@codeaurora.org, nicolas.guion@st.com, corbet@lwn.net, mark.rutland@arm.com, zhang.lyra@gmail.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-api@vger.kernel.orgi, linux-doc@vger.kernel.org Subject: [PATCH 2/6] stm class: adds a loop to extract the first valid STM device name Date: Mon, 1 Feb 2016 15:58:45 +0800 Message-Id: <1454313529-8860-3-git-send-email-zhang.chunyan@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1454313529-8860-1-git-send-email-zhang.chunyan@linaro.org> References: <1454313529-8860-1-git-send-email-zhang.chunyan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The node name of STM master management policy is a concatenation of an STM device name to which this policy applies and following an arbitrary string, these two strings are concatenated with a dot. This patch adds a loop for extracting the STM device name when an arbitrary number of dot(s) are found in this STM device name. Signed-off-by: Chunyan Zhang --- drivers/hwtracing/stm/policy.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) -- 1.9.1 diff --git a/drivers/hwtracing/stm/policy.c b/drivers/hwtracing/stm/policy.c index 11ab6d0..691686e 100644 --- a/drivers/hwtracing/stm/policy.c +++ b/drivers/hwtracing/stm/policy.c @@ -321,21 +321,26 @@ stp_policies_make(struct config_group *group, const char *name) /* * node must look like ., where * is the name of an existing stm device and - * is an arbitrary string + * is an arbitrary string, when an arbitrary + * number of dot(s) are found in the , the + * first matched STM device name would be extracted. */ - p = strchr(devname, '.'); - if (!p) { - kfree(devname); - return ERR_PTR(-EINVAL); - } + for (p = devname; ; p++) { + p = strchr(p, '.'); + if (!p) { + kfree(devname); + return ERR_PTR(-EINVAL); + } - *p++ = '\0'; + *p = '\0'; - stm = stm_find_device(devname); - kfree(devname); + stm = stm_find_device(devname); + if (stm) + break; + *p = '.'; + }; - if (!stm) - return ERR_PTR(-ENODEV); + kfree(devname); mutex_lock(&stm->policy_mutex); if (stm->policy) {