From mboxrd@z Thu Jan 1 00:00:00 1970 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,URIBL_BLOCKED, 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 EA480C433B4 for ; Wed, 19 May 2021 09:54:53 +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 713A6610A1 for ; Wed, 19 May 2021 09:54:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 713A6610A1 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=uC8X2pX8amj3mNHlPCOI0Jik5dFJhP0672e92/pGFUs=; b=RHjIC3gVMql4HQUf8staVaZB4 sMpdFPB2J641zOBB+UmeqXQcFmG4/fEDaGFwJa4X9CEsauY4GyR32KgYmpuRefueqy8Y/msCIC6PV lNjo4bgcN3eH9DQ0CPLGiE9/lGVZijbnwBbj/ktCDtQ6dD672OaySemuihkrj6+oB54gGX5lXutKf o0ql7OMhKJckTZfs33dxtR5GAtUJnVRsATUdK/Nx5oxOfrCE0GHTrE14RtQcuvLTjSlMO32WQwlYG jvQgh9KsPu/CHdxX9/BP3en1BIqz+HZ/Jez66pafWJ2CaxwZA55PCZwM1OKGA8DH8HvxFRkEC4O88 +G8vP0/0w==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1ljItN-003WC4-55; Wed, 19 May 2021 09:53:29 +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 1ljIsH-003Vs3-AA for linux-arm-kernel@desiato.infradead.org; Wed, 19 May 2021 09:52:21 +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=QzYAcOaCD+iR3DlrhLT9j8nsLJ/pU1gPeshArEwm1pE=; b=mIO0KOA+dDDvgOYcN0tYHn066v xRyI3w/5JsbS/rAl4FxlKR/GDuZ86RkTCg8mYvf3c3DcIgYx9HIAmEgO5vS4V0WDKNwpCT0XF81L3 D9Pa+GRCPsET3b8uRRbFXYaE2chkpjfbzV34WvmQq3zoYf6ocsQKLL0dUC8fzu+DsLD1WceeN1EOf f2SuPsfBK8UNhWkfmur5vuJFkvJaH3yYUpmeT/yxoxiAmeN1rZJLCn0tt4EJZQeHZnlYdhLYhEvjV 3lzqP82ajY2+h/GwWOUvS6KjLPWDHGAJRGU61Kvsq+1YfanPtmZqJf4kXg2OUBPLBoccv2MzR5KKe 4c68zLLg==; Received: from szxga06-in.huawei.com ([45.249.212.32]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ljIsE-00FKjY-2c for linux-arm-kernel@lists.infradead.org; Wed, 19 May 2021 09:52:20 +0000 Received: from dggems703-chm.china.huawei.com (unknown [172.30.72.60]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4FlSlV42g5zmXMm; Wed, 19 May 2021 17:49:58 +0800 (CST) Received: from dggema757-chm.china.huawei.com (10.1.198.199) by dggems703-chm.china.huawei.com (10.3.19.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2176.2; Wed, 19 May 2021 17:52:14 +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; Wed, 19 May 2021 17:52:14 +0800 From: Qi Liu To: , CC: , Andy Gross , Will Deacon , Mark Rutland Subject: [PATCH v2 4/9] drivers/perf: Remove redundant macro and functions in qcom_l2_pmu.c Date: Wed, 19 May 2021 17:51:54 +0800 Message-ID: <1621417919-6632-5-git-send-email-liuqi115@huawei.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1621417919-6632-1-git-send-email-liuqi115@huawei.com> References: <1621417919-6632-1-git-send-email-liuqi115@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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-20210519_025218_313619_6368F4C3 X-CRM114-Status: GOOD ( 11.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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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. Cc: Andy Gross Cc: Will Deacon Cc: Mark Rutland 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 }; -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel