Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp3038548rwr; Fri, 28 Apr 2023 22:44:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5TE7a8T3zaPQJ3X60+xDjerUMNJbHpKMnZHBvHRGZtnUWAyQuPRl6y0EpfK5DyDSaARWEc X-Received: by 2002:a05:6a20:1616:b0:f0:38a7:dc71 with SMTP id l22-20020a056a20161600b000f038a7dc71mr10097985pzj.4.1682747097969; Fri, 28 Apr 2023 22:44:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682747097; cv=none; d=google.com; s=arc-20160816; b=ZFr8M4ZEnpk/G1VKpj+ObPMkTuOgTP2DZivyHZv/CBjHx/es0VjO9LaG1NLApGg5cZ OhSIV3md1RFgqLHd5+Y6rGh1frphs04MpCnonS6t+bqgehfEb8sAGIWs2aF9NM45f3ke PhLNbKSE5jQ7K6Pc1OmXcISgzOajdPj0vsct1K05EAa89l6X2HcexqdHdh6dDWGbQu4i 4SEh4wBvHoS936Fif9m9JioHzlrgwHR/4O4iGz7jvVjsk2FuPK7//yc8xDR0iouArypJ Ms2G5gygNpwK39apzpW253o75DmjcMfWUWmCxHiKswJTKFKcGlHPFE5cfrtyw/uR5ID/ vDUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=feNyjAPtIUSUDrmLxKNanb31JNx+5xcJ7s4SppqU3s8=; b=kgcL7tNwP15U1wI8tz8gzDmZVdJD0zMCA6EIqL6udPak/nGw/RW0gjNHS/9eWCSb+V aOPGsgfvRo0Cy/kXpBdFwcJ763j8PLl3Wx1CPlgspvQOJQmPhQbNkBT1macmKMq0kHnY Yz/NeeNbObkHlxstzAjn0q/zH3bC28HRe9ShlQ/I4EPVHzQMvkYsgwzkG+qzZ8w219gv GMV5P31iExS26ZVHRyn8MNgoY4sPcavkmaEe44Ygsq/Kag2wk2nP1yGfagj2iBh3xi1D EHcfmVrmmfH5pXLeumEPGn4G44lGxiDCVpDxUTewOxvvawBJ+7OZwWIaBPWbK8IpprEI +DuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=mzrmCY6k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z31-20020a630a5f000000b0051372ef848fsi23462655pgk.697.2023.04.28.22.44.44; Fri, 28 Apr 2023 22:44:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=mzrmCY6k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347411AbjD2Fl3 (ORCPT + 99 others); Sat, 29 Apr 2023 01:41:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347414AbjD2FlT (ORCPT ); Sat, 29 Apr 2023 01:41:19 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0BE430EE for ; Fri, 28 Apr 2023 22:40:54 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-54f6da2edbdso10729507b3.0 for ; Fri, 28 Apr 2023 22:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682746772; x=1685338772; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=feNyjAPtIUSUDrmLxKNanb31JNx+5xcJ7s4SppqU3s8=; b=mzrmCY6ku4SyMEw1YxXy3v7fV8LU/PrtiOl3HBoXxT6jsenn6LMJOwlsO9n/bGjz/2 qO+ErKCjKYsdmEDudSRRtXNZipPl1wI+ReV2D7hQCw2D15ESfkukSqKdH8edXgSb8Z9Z aJDDKU9DmrTf36vElrOEOy22+lVO2upP5Ll41L5jcGpSJ6DrRhYn+TTOL2IXZdVKku8N nUQ8+02s0Y9JrWlqkY0LkY4WMnzbAJiqwfIHAFPVnMevB2/zTUd0Tdljl+kEX2t2i75V eE+miOrRCeSDozDizzHam+111mqezpmzeoopJxdWam6MY7U8snyzppK32vqj2YQvHEYl 48Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682746772; x=1685338772; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=feNyjAPtIUSUDrmLxKNanb31JNx+5xcJ7s4SppqU3s8=; b=V5CuF4jS6k3dIOIG49HpSiuxctbaHsCCFmQ5jsb4Lisd7cbhbLegfi0dw4Qwb12UB/ DaH4N9LWqigWDmtKlX42fAD7tcfDoJcPs9lKEeDmh/p6sbvLCe1S3EjkNRnpEWlFZkdW aEnihccIMJmjVDCGtZoTpl56Nofb10eMjX2YX2HiRjw0AZHQIqCHI04m7DyIVFE9DyBD 1IYbFB2WQliGcjyxj7CbH3Yqy99wuBym7KpOdpEFpcgNBeL56+X4uLehdR/1yCH/ZZn7 LG0SiImRK9INoV8Q/SmxGxSUy9LSo/0N8n+3WFBZGb6Yhq1xhV1nWEISwaEar+3EoJsS DiVA== X-Gm-Message-State: AC+VfDwtZVs8VSpOIrbH6nbTkPx7bMVvEB2cWqDPs/TgZRcUHx1KQO/q j8JpyzRUuCF+Hldr77kyolT1D653bMiY X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:c563:7e28:fb7c:bce3]) (user=irogers job=sendgmr) by 2002:a81:bd4d:0:b0:54f:b2a3:8441 with SMTP id n13-20020a81bd4d000000b0054fb2a38441mr4268579ywk.10.1682746772308; Fri, 28 Apr 2023 22:39:32 -0700 (PDT) Date: Fri, 28 Apr 2023 22:34:50 -0700 In-Reply-To: <20230429053506.1962559-1-irogers@google.com> Message-Id: <20230429053506.1962559-31-irogers@google.com> Mime-Version: 1.0 References: <20230429053506.1962559-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Subject: [PATCH v3 30/46] perf parse-events: Minor type safety cleanup From: Ian Rogers To: Arnaldo Carvalho de Melo , Kan Liang , Ahmad Yasin , Peter Zijlstra , Ingo Molnar , Stephane Eranian , Andi Kleen , Perry Taylor , Samantha Alt , Caleb Biggers , Weilin Wang , Edward Baker , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Florian Fischer , Rob Herring , Zhengjun Xing , John Garry , Kajol Jain , Sumanth Korikkar , Thomas Richter , Tiezhu Yang , Ravi Bangoria , Leo Yan , Yang Jihong , James Clark , Suzuki Poulouse , Kang Minchul , Athira Rajeev , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ian Rogers Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the typed parse_state rather than void* _parse_state when available. Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.y | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 5055a29a448f..e709508b1d6e 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -301,7 +301,7 @@ PE_NAME opt_pmu_config if (!list) CLEANUP_YYABORT; /* Attempt to add to list assuming $1 is a PMU name. */ - if (parse_events_add_pmu(_parse_state, list, $1, $2, /*auto_merge_stats=*/false)) { + if (parse_events_add_pmu(parse_state, list, $1, $2, /*auto_merge_stats=*/false)) { struct perf_pmu *pmu = NULL; int ok = 0; @@ -319,7 +319,7 @@ PE_NAME opt_pmu_config !perf_pmu__match(pattern, pmu->alias_name, $1)) { if (parse_events_copy_term_list(orig_terms, &terms)) CLEANUP_YYABORT; - if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, + if (!parse_events_add_pmu(parse_state, list, pmu->name, terms, /*auto_merge_stats=*/true)) { ok++; parse_state->wild_card_pmus = true; @@ -331,7 +331,7 @@ PE_NAME opt_pmu_config if (!ok) { /* Failure to add, assume $1 is an event name. */ zfree(&list); - ok = !parse_events_multi_pmu_add(_parse_state, $1, $2, &list); + ok = !parse_events_multi_pmu_add(parse_state, $1, $2, &list); $2 = NULL; } if (!ok) -- 2.40.1.495.gc816e09b53d-goog