From patchwork Mon Feb 1 08:19:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 60872 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp2879980lbb; Mon, 1 Feb 2016 00:20:09 -0800 (PST) X-Received: by 10.98.9.27 with SMTP id e27mr22660879pfd.59.1454314809447; Mon, 01 Feb 2016 00:20:09 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 14si44885063pfa.12.2016.02.01.00.20.09; Mon, 01 Feb 2016 00:20:09 -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 S1752318AbcBAIUH (ORCPT + 30 others); Mon, 1 Feb 2016 03:20:07 -0500 Received: from mail-pf0-f169.google.com ([209.85.192.169]:34256 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751853AbcBAIUE (ORCPT ); Mon, 1 Feb 2016 03:20:04 -0500 Received: by mail-pf0-f169.google.com with SMTP id o185so74871250pfb.1 for ; Mon, 01 Feb 2016 00:20:03 -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=BiW9NXEGiLhPu7S1UCHTMG0WiTzzOqGGr13p6YjjVybAYA/zC0fwu/1+dOPbowR+cR D4utrwcvs4ZTak5zb/qo4L0sC6TFR0xHudAfwN4Z1jW2/60A8z7hY7O9gMHHslJHstaN 3YMWC9ocXAz+54ONLdLEW0zMhYy/WeOWMtkiw= 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=O/wDYPf52lpclStH/u4wWjY2kVRVfxNfije0nxQbrQTtN6ScrjZlcgc2uY1Ao2U7Jc ag5Ggccx/eKou/UFg7fgMAvgZlIt1nE7NcMFI4wkBziA8iYtS/hGRtmaDRw0p4gifyBh R5/lHdX4ZSgUDB9Rh2hS4pd0CSzCzG4UBA044V0slWTyXKASMu+l/Ugp9foZL56lJtXj E9UZCUu+7WeUqITdigDqCxtx8FqqzKZM/hRRISRr9u7VTL22oUhPOFtltLPKjfIp0Mat cXODF9a/2lTh72r8CeY4hJU/nj28RUsBReM1Uqsyx7SPaPXyk2d//EjtUHfeB2xt4g7C 9amg== X-Gm-Message-State: AG10YORPOpWBYgCODO8yjqOnfIexdhZnNOx5TEU/qUtlaMRi1duBuAoYrDgeKuGjapdMrE2b X-Received: by 10.98.67.135 with SMTP id l7mr36456873pfi.148.1454314803718; Mon, 01 Feb 2016 00:20:03 -0800 (PST) Received: from zcy-ubuntu.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id 68sm40980126pfa.78.2016.02.01.00.19.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Feb 2016 00:20:02 -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.org, 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 16:19:47 +0800 Message-Id: <1454314787-9199-1-git-send-email-zhang.chunyan@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1454313529-8860-3-git-send-email-zhang.chunyan@linaro.org> References: <1454313529-8860-3-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) {