From patchwork Fri Apr 7 15:22:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 9669673 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AF5DB6021C for ; Fri, 7 Apr 2017 15:23:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0DC728607 for ; Fri, 7 Apr 2017 15:23:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 947872860F; Fri, 7 Apr 2017 15:23:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 27FFE28607 for ; Fri, 7 Apr 2017 15:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=EcgJJAXOxs+ADPKkcBWPVdNbWl2bIUaY+/dMwWN2/lQ=; b=UAv IemNqV0J/L+u2Zo4EcpkQP2wikUTyhYeNv0UZ4bjp6KcIX1npCxVpd1Yv/xYOc93bv4QpT8U/dKaU pfMqBP5V4yS1FRi4AVkANANZqiDY2rTPCRsKOBzoCfVdq8u96CyS7LYUwrsgBzu4iGZKcnbD8Xsnk cP74TJvFEtlCbp3mbD4nXZen17l1FYvLV63LN2o3S7QZrId1saUQ18/0DkQzCByxoa2YWulmj3Pq0 ePRr8t/p0K/3xyXu2whYDO+q4+ydc1WsJp+/xufPXsWE/UNWor9GmU/atNsUotP85mknZv3okZWzA 45n/ubtXla5Ir0rMwhX5Z4Z/YPbSQDQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cwVj7-00032q-56; Fri, 07 Apr 2017 15:23:05 +0000 Received: from mail-pg0-x236.google.com ([2607:f8b0:400e:c05::236]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cwVj2-0002xM-1u for linux-arm-kernel@lists.infradead.org; Fri, 07 Apr 2017 15:23:02 +0000 Received: by mail-pg0-x236.google.com with SMTP id x125so69714268pgb.0 for ; Fri, 07 Apr 2017 08:22:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=P30P4b0J+r8FQ55cp9nJo4dLSdsuVGYP5YWzTbKXpeY=; b=OiUleCgsJGHWIsuvmnvqTAigp7rEiIbLldJ1j5tg964l7YnszSKi9X8KxIv828bGDu oNgtV801/9buvnZQ1X9hY3t8V1M8QqDAVnpq0NjrB13pgboDISOZxurvagBrjrhOFVBQ 0Xu2qt1KfVpzyd55MZYNh0/AZVUngrX/gc8cE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=P30P4b0J+r8FQ55cp9nJo4dLSdsuVGYP5YWzTbKXpeY=; b=ezwsROsP/eEismZ7hx+wLaH9/jC63NgHoLpiegZKeZcf0xBIpWS8QCL/AX0G49sYfc x2rEhYmHocVvUbNwnx0DyVwyykBF2ed9nQibTgVVKmpcW4Ykby7zz2ZkeDu9QGqQSKBs My7nbaD2EBfFyKCUUnqaqWnA0fqpUKCxp+ZiJDL/UJXNiyY5YfO4jkKk4cz3uEOFwNRc YFnkmeONDZlZIz9YyQyeq5El/wgHh9p4T/tpvK91UH2plnsOZ7j6zSGCeS5UsbPmM9ED 9nbd4ElLZ+0S1vzqAx7lRNcYWxxlbAPq1G7zyRc2Gx/gGKOMawkv/8go+30kl4S2i0iv t3zw== X-Gm-Message-State: AFeK/H0OVcFSTeliHy7youWLrO0vxtVGjrYnTmaCtt1brvj2RY9MkG5Fa5EvanddHr5doHr7 X-Received: by 10.99.94.195 with SMTP id s186mr42362616pgb.197.1491578558702; Fri, 07 Apr 2017 08:22:38 -0700 (PDT) Received: from localhost.localdomain (li1563-109.members.linode.com. [139.162.83.109]) by smtp.gmail.com with ESMTPSA id u129sm10322792pfu.48.2017.04.07.08.22.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Apr 2017 08:22:36 -0700 (PDT) From: Leo Yan To: Mathieu Poirier , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] coresight: tmc: minor fix for output log Date: Fri, 7 Apr 2017 23:22:00 +0800 Message-Id: <1491578520-5957-1-git-send-email-leo.yan@linaro.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170407_082300_129177_39642754 X-CRM114-Status: GOOD ( 12.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leo Yan MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In current code the output logs are not well symmetric for sink and link enabling and disabling. This patch is to fix that so can output paired logs. Cc: Mathieu Poirier Signed-off-by: Leo Yan --- drivers/hwtracing/coresight/coresight-tmc-etf.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c index 1549436..3a1c181 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etf.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c @@ -166,9 +166,6 @@ static int tmc_enable_etf_sink_sysfs(struct coresight_device *csdev) if (!used) kfree(buf); - if (!ret) - dev_info(drvdata->dev, "TMC-ETB/ETF enabled\n"); - return ret; } @@ -204,15 +201,27 @@ static int tmc_enable_etf_sink_perf(struct coresight_device *csdev) static int tmc_enable_etf_sink(struct coresight_device *csdev, u32 mode) { + int ret; + struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); + switch (mode) { case CS_MODE_SYSFS: - return tmc_enable_etf_sink_sysfs(csdev); + ret = tmc_enable_etf_sink_sysfs(csdev); + break; case CS_MODE_PERF: - return tmc_enable_etf_sink_perf(csdev); + ret = tmc_enable_etf_sink_perf(csdev); + break; + /* We shouldn't be here */ + default: + ret = -EINVAL; + break; } - /* We shouldn't be here */ - return -EINVAL; + if (ret) + return ret; + + dev_info(drvdata->dev, "TMC-ETB/ETF enabled\n"); + return 0; } static void tmc_disable_etf_sink(struct coresight_device *csdev) @@ -273,7 +282,7 @@ static void tmc_disable_etf_link(struct coresight_device *csdev, drvdata->mode = CS_MODE_DISABLED; spin_unlock_irqrestore(&drvdata->spinlock, flags); - dev_info(drvdata->dev, "TMC disabled\n"); + dev_info(drvdata->dev, "TMC-ETF disabled\n"); } static void *tmc_alloc_etf_buffer(struct coresight_device *csdev, int cpu,