From nobody Fri Jan 2 20:37:06 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6ABB5E95A91 for ; Mon, 9 Oct 2023 03:58:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345044AbjJID4x (ORCPT ); Sun, 8 Oct 2023 23:56:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344883AbjJID4v (ORCPT ); Sun, 8 Oct 2023 23:56:51 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 12DB0A3 for ; Sun, 8 Oct 2023 20:56:50 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B43831FB; Sun, 8 Oct 2023 20:57:29 -0700 (PDT) Received: from a077893.blr.arm.com (a077893.blr.arm.com [10.162.41.8]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 779503F7A6; Sun, 8 Oct 2023 20:56:47 -0700 (PDT) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org Cc: Anshuman Khandual , Will Deacon , Mark Rutland , linux-kernel@vger.kernel.org Subject: [PATCH] driver: perf: arm_pmu: Drop some unused arguments from armv8_pmu_init() Date: Mon, 9 Oct 2023 09:26:38 +0530 Message-Id: <20231009035638.165270-1-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" There is just a single call site remaining for armv8_pmu_init(), passing on NULL pointers for all custom 'struct attribute_group'. These arguments are not really getting used and hence can just be dropped off, thus simplifying the code further. Cc: Will Deacon Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Anshuman Khandual --- This applies on v6.6-rc5. drivers/perf/arm_pmuv3.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/perf/arm_pmuv3.c b/drivers/perf/arm_pmuv3.c index 8fcaa26f0f8a..fe4db1831662 100644 --- a/drivers/perf/arm_pmuv3.c +++ b/drivers/perf/arm_pmuv3.c @@ -1187,10 +1187,7 @@ static void armv8_pmu_register_sysctl_table(void) } =20 static int armv8_pmu_init(struct arm_pmu *cpu_pmu, char *name, - int (*map_event)(struct perf_event *event), - const struct attribute_group *events, - const struct attribute_group *format, - const struct attribute_group *caps) + int (*map_event)(struct perf_event *event)) { int ret =3D armv8pmu_probe_pmu(cpu_pmu); if (ret) @@ -1212,13 +1209,9 @@ static int armv8_pmu_init(struct arm_pmu *cpu_pmu, c= har *name, =20 cpu_pmu->name =3D name; cpu_pmu->map_event =3D map_event; - cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] =3D events ? - events : &armv8_pmuv3_events_attr_group; - cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_FORMATS] =3D format ? - format : &armv8_pmuv3_format_attr_group; - cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_CAPS] =3D caps ? - caps : &armv8_pmuv3_caps_attr_group; - + cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] =3D &armv8_pmuv3_events_at= tr_group; + cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_FORMATS] =3D &armv8_pmuv3_format_a= ttr_group; + cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_CAPS] =3D &armv8_pmuv3_caps_attr_g= roup; armv8_pmu_register_sysctl_table(); return 0; } @@ -1226,7 +1219,7 @@ static int armv8_pmu_init(struct arm_pmu *cpu_pmu, ch= ar *name, static int armv8_pmu_init_nogroups(struct arm_pmu *cpu_pmu, char *name, int (*map_event)(struct perf_event *event)) { - return armv8_pmu_init(cpu_pmu, name, map_event, NULL, NULL, NULL); + return armv8_pmu_init(cpu_pmu, name, map_event); } =20 #define PMUV3_INIT_SIMPLE(name) \ --=20 2.25.1