Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp187464pxf; Wed, 17 Mar 2021 02:46:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJygzu/5BmS+IerbWa71do13fQlf8O+au1YnCvbNxsiBvwgJ+97APDu6ZDmUk5AAM8DNIhOh X-Received: by 2002:aa7:cd16:: with SMTP id b22mr42118822edw.357.1615974367262; Wed, 17 Mar 2021 02:46:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615974367; cv=none; d=google.com; s=arc-20160816; b=ee80U5kA5dukLRX8Q0uUvQmDl0kS34PfFGyi3YO5v5n2DJi3QvhQLghhvVRXVM9Y68 vc24nNye7RQNOrMHlhvH3B2fU6d11XJ82YFrjIg3QnlbHlK4YY8eoAaT/5WYlRMphJ7e v94Aya6ORrQvXvgOTMjcZt/XLKPitFWNqjqbRo+L1V62SIOvifZQfPGLLR7h3tdQu/08 76USoE0f8sWXhRkF8FvOcvEETzmCJNM/jTxFssgx5aw0ynH24HU3jcBHRM2dXUXeuClg dNWuaH1gTn501jyri8M2SLIqkdZyrwDAcnD9z2I9IbXNFyC/03qeR1yv4UwTzIvvz7Mw kW3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=1oU1OShWyUltPuPdw99nr9b+8siNC21y9tD93zKj9Qk=; b=Ybl9y96XB9aKkDixox+Tu0VTVT/5eyApAwoYkjgNKV7x+z3tySTEuYvuIiTNrvDzvf OpZ19xdKS69tx4SR8G1H8NUwd+e3F4Z13Y8N+oZ9JQtghtXWHbll0DIGydrIa55ws1F3 feSr8l4h0y9ulhHT4o5hDtZHmvQxFJs1AU9bRrTZeL9eyW43tOQyljR0iBymhV/DTga0 5SOn4KPSE5QORH+zHdtZUc7wyTS80tUpmLKYVUm97/I2aT7FxDKue5iwmHBJHu2z+ctA hetEhXg2TiGzqf0x/osEyHssNabIsvna8rKvwhqJSg02dAytHL4Ja5peHExLY0nDsv41 2UmA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e7si12558699edk.222.2021.03.17.02.45.44; Wed, 17 Mar 2021 02:46:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229890AbhCQJoj (ORCPT + 99 others); Wed, 17 Mar 2021 05:44:39 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:13181 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229658AbhCQJoV (ORCPT ); Wed, 17 Mar 2021 05:44:21 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4F0lYH6rCXzmYfS; Wed, 17 Mar 2021 17:41:55 +0800 (CST) Received: from localhost.localdomain (10.67.165.24) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.498.0; Wed, 17 Mar 2021 17:44:13 +0800 From: Qi Liu To: , , , CC: , , Subject: [PATCH 2/3] drivers/perf: convert sysfs scnprintf family to sysfs_emit_at Date: Wed, 17 Mar 2021 17:41:50 +0800 Message-ID: <1615974111-45601-3-git-send-email-liuqi115@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1615974111-45601-1-git-send-email-liuqi115@huawei.com> References: <1615974111-45601-1-git-send-email-liuqi115@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.165.24] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the generic sysfs_emit_at() function take place of scnprintf() Signed-off-by: Qi Liu --- drivers/perf/arm-ccn.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/perf/arm-ccn.c b/drivers/perf/arm-ccn.c index 3a2ddc0..0588f29 100644 --- a/drivers/perf/arm-ccn.c +++ b/drivers/perf/arm-ccn.c @@ -328,41 +328,37 @@ static ssize_t arm_ccn_pmu_event_show(struct device *dev, struct arm_ccn_pmu_event, attr); ssize_t res; - res = scnprintf(buf, PAGE_SIZE, "type=0x%x", event->type); + res = sysfs_emit(buf, "type=0x%x", event->type); if (event->event) - res += scnprintf(buf + res, PAGE_SIZE - res, ",event=0x%x", + res += sysfs_emit_at(buf + res, res, ",event=0x%x", event->event); if (event->def) - res += scnprintf(buf + res, PAGE_SIZE - res, ",%s", - event->def); + res += sysfs_emit_at(buf + res, res, ",%s", event->def); if (event->mask) - res += scnprintf(buf + res, PAGE_SIZE - res, ",mask=0x%x", - event->mask); + res += sysfs_emit_at(buf + res, res, ",mask=0x%x", event->mask); /* Arguments required by an event */ switch (event->type) { case CCN_TYPE_CYCLES: break; case CCN_TYPE_XP: - res += scnprintf(buf + res, PAGE_SIZE - res, - ",xp=?,vc=?"); + res += sysfs_emit(buf + res, res, ",xp=?,vc=?"); if (event->event == CCN_EVENT_WATCHPOINT) - res += scnprintf(buf + res, PAGE_SIZE - res, + res += sysfs_emit_at(buf + res, res, ",port=?,dir=?,cmp_l=?,cmp_h=?,mask=?"); else - res += scnprintf(buf + res, PAGE_SIZE - res, - ",bus=?"); + res += sysfs_emit_at(buf + res, res, ",bus=?"); break; case CCN_TYPE_MN: - res += scnprintf(buf + res, PAGE_SIZE - res, ",node=%d", ccn->mn_id); + res += sysfs_emit_at(buf + res, res, ",node=%d", ccn->mn_id); break; default: - res += scnprintf(buf + res, PAGE_SIZE - res, ",node=?"); + res += sysfs_emit_at(buf + res, res, ",node=?"); break; } - res += scnprintf(buf + res, PAGE_SIZE - res, "\n"); + res += sysfs_emit_at(buf + res, res, "\n"); return res; } -- 2.8.1