From patchwork Tue May 18 07:23:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "liuqi (BA)" X-Patchwork-Id: 12264007 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62CACC433ED for ; Tue, 18 May 2021 07:29:41 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E2B5C6117A for ; Tue, 18 May 2021 07:29:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E2B5C6117A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=k02isZnSrA88yS5JepgZhZ55Kky4qBKWqacLdav+pq4=; b=hQhVpnuzcafKEMW82aUW8AJxT Wf0G5uF6IUTY00hOLi8ZRbcVIVyHTllWv9E52QxakYzyFoaUxCj/4CGr1vt3ypuAzKytZ2EDmT4X5 M85JUXw7N6TrJKtGXTMmT1+ZVoaL54WEOecvIS3HS/Qbd6D+c8DUNba3Z8ADeq4LcMUIwcsuBE7dL qZXx2yGGT+SqMkulmQDLBq6wJQMZ+GvSrFoJ18Z6nKgpCfDSioK0rOzxjZUI8WsDhrWhurAm1LOXr bPgVIvt1D0qj7wotk4Ss0DzvfhgyhiyJ/v6zBHhqbZI+4hTpZ4y/rJ6k0zi2pAg3QGB68VXzCIcXE kjVrM3bQw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1liu8t-00HLKf-Vc; Tue, 18 May 2021 07:27:52 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1liu5G-00HJlY-W7 for linux-arm-kernel@desiato.infradead.org; Tue, 18 May 2021 07:24:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:CC:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=kXGzEz6oBPTpbHoU8EZigb+QSv5xGcSKHgAx9oF4HGE=; b=W7uQ6AXeheOvm76HNSHbp+SYxW sJZgdsI9OOV2HJ16X6UKXnewK+Hh+klkfSaOxxmG3LfNEIkfoDhopa0Ax8seUay/BEeaXBHIr5CPB luouIIerOGCD4JIv1xN2PoxwHuSz4D4FRFqPxcI1yNs+EU+FzZdZNyeETXnnmQKJHyFE7U3svr8WR aCLhMZSppPse+3jfz4V9jdlQ6sByQKoVLnfgH1QpazCh6C//Etplyit885GpuUPGtZQIgAhra7cc3 KqfrnXjAubs+yCcPzTznJfyWy6Lx0RgH58BOtgkqFSaK4mGfZxJRdhpO+uV3cJp7tN09XEwUGdXBK 472qUdmg==; Received: from szxga07-in.huawei.com ([45.249.212.35]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1liu5C-00EPN8-9g for linux-arm-kernel@lists.infradead.org; Tue, 18 May 2021 07:24:05 +0000 Received: from dggems702-chm.china.huawei.com (unknown [172.30.72.59]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4FknVD5D5jzCtm0; Tue, 18 May 2021 15:21:08 +0800 (CST) Received: from dggema757-chm.china.huawei.com (10.1.198.199) by dggems702-chm.china.huawei.com (10.3.19.179) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2176.2; Tue, 18 May 2021 15:23:54 +0800 Received: from localhost.localdomain (10.69.192.56) by dggema757-chm.china.huawei.com (10.1.198.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Tue, 18 May 2021 15:23:53 +0800 From: Qi Liu To: , , CC: , , , Subject: [PATCH 4/9] drivers/perf: Remove redundant macro and functions in qcom_l2_pmu.c Date: Tue, 18 May 2021 15:23:43 +0800 Message-ID: <1621322628-9945-5-git-send-email-liuqi115@huawei.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1621322628-9945-1-git-send-email-liuqi115@huawei.com> References: <1621322628-9945-1-git-send-email-liuqi115@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggema757-chm.china.huawei.com (10.1.198.199) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210518_002402_574752_FF5105CC X-CRM114-Status: GOOD ( 10.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Remove L2CACHE_EVENT_ATTR and l2cache_pmu_event_show(), as there is a general function for this. Signed-off-by: Qi Liu --- drivers/perf/qcom_l2_pmu.c | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/drivers/perf/qcom_l2_pmu.c b/drivers/perf/qcom_l2_pmu.c index fc54a80..aa3ae21 100644 --- a/drivers/perf/qcom_l2_pmu.c +++ b/drivers/perf/qcom_l2_pmu.c @@ -670,33 +670,18 @@ static const struct attribute_group l2_cache_pmu_format_group = { .attrs = l2_cache_pmu_formats, }; -static ssize_t l2cache_pmu_event_show(struct device *dev, - struct device_attribute *attr, char *page) -{ - struct perf_pmu_events_attr *pmu_attr; - - pmu_attr = container_of(attr, struct perf_pmu_events_attr, attr); - return sysfs_emit(page, "event=0x%02llx\n", pmu_attr->id); -} - -#define L2CACHE_EVENT_ATTR(_name, _id) \ - (&((struct perf_pmu_events_attr[]) { \ - { .attr = __ATTR(_name, 0444, l2cache_pmu_event_show, NULL), \ - .id = _id, } \ - })[0].attr.attr) - static struct attribute *l2_cache_pmu_events[] = { - L2CACHE_EVENT_ATTR(cycles, L2_EVENT_CYCLES), - L2CACHE_EVENT_ATTR(dcache-ops, L2_EVENT_DCACHE_OPS), - L2CACHE_EVENT_ATTR(icache-ops, L2_EVENT_ICACHE_OPS), - L2CACHE_EVENT_ATTR(tlbi, L2_EVENT_TLBI), - L2CACHE_EVENT_ATTR(barriers, L2_EVENT_BARRIERS), - L2CACHE_EVENT_ATTR(total-reads, L2_EVENT_TOTAL_READS), - L2CACHE_EVENT_ATTR(total-writes, L2_EVENT_TOTAL_WRITES), - L2CACHE_EVENT_ATTR(total-requests, L2_EVENT_TOTAL_REQUESTS), - L2CACHE_EVENT_ATTR(ldrex, L2_EVENT_LDREX), - L2CACHE_EVENT_ATTR(strex, L2_EVENT_STREX), - L2CACHE_EVENT_ATTR(clrex, L2_EVENT_CLREX), + PMU_EVENT_ATTR_ID(cycles, L2_EVENT_CYCLES), + PMU_EVENT_ATTR_ID(dcache-ops, L2_EVENT_DCACHE_OPS), + PMU_EVENT_ATTR_ID(icache-ops, L2_EVENT_ICACHE_OPS), + PMU_EVENT_ATTR_ID(tlbi, L2_EVENT_TLBI), + PMU_EVENT_ATTR_ID(barriers, L2_EVENT_BARRIERS), + PMU_EVENT_ATTR_ID(total-reads, L2_EVENT_TOTAL_READS), + PMU_EVENT_ATTR_ID(total-writes, L2_EVENT_TOTAL_WRITES), + PMU_EVENT_ATTR_ID(total-requests, L2_EVENT_TOTAL_REQUESTS), + PMU_EVENT_ATTR_ID(ldrex, L2_EVENT_LDREX), + PMU_EVENT_ATTR_ID(strex, L2_EVENT_STREX), + PMU_EVENT_ATTR_ID(clrex, L2_EVENT_CLREX), NULL };