From patchwork Fri Aug 4 19:01:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 131319 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp61092vqr; Fri, 4 Aug 2023 12:40:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFDSnePxS0bMqQwLwFIxKHPulq9NuoxTkIElL1o6J3wVcYCqsdKl18ijJVszQMna3Tcqwrn X-Received: by 2002:a17:906:ef8c:b0:99c:ae91:e812 with SMTP id ze12-20020a170906ef8c00b0099cae91e812mr965887ejb.73.1691178043738; Fri, 04 Aug 2023 12:40:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691178043; cv=none; d=google.com; s=arc-20160816; b=cGFI36VAj0t3maYhSth9oUJYaFI3vvBH2O4tBFIYXZwOnyGJ41nVcQ5Al8Y9FQgMN9 e+Do8t8bNgBpKLFCFujvnFcDl/fNu2a0IKowMZTfAERQbEysdtrB7wzCdskIMbbgQcgU vwg4wY1XRXJsUF9zR88dMxCSVznaa+GT8h3hW/ZI1vNqHyGqIHUQBzMIpxj0rGarJwNd bNLrkjT+KL+oaHHRoMMSByXXjzwhvJGHSSejqPpBDmR5C0qE0ZUI7+fBybA6z9DEjoGN uZojNFOhWiflbFKFiTQpEQnZJlBMS7y6WLNeP86E1RpM3ER+A95xkNVUbG8Z+/VFEe3b 3vLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=0XC7sBCxKyro3FDdApnc8bHmW1JXcIbMux65vPzudZs=; fh=Qj4j2WPb9rMxaNYIUWRf7iYXU0oM15YEll4qKRxlSD4=; b=UM1y/LLjinUl5Wevcg4MvIJVxGw29fr4Fl+V2aBZwbhoVvQgLwv6rH5ASpWBM5+0Cf a2umcph0Mw0A/dx+L/28N9eDvAIb7fdq+KfXjoao8MkH8LavKkz1USBPZQkmvW3Bnzq+ jT/mQGfTEyUnzqxzistN0PM8/Tnr2XdOJ6o0A3u2BMjDV3YyEjGdABvBnTh6rqI423Z2 XX39qWKx1uN8pg1E52j+t+BG384YbTNdUk2KlADLXu+Jf1yftStAeDbkJiWdfjzip+YO c7R49NVxZSuDtAn5zCn5Z9jOzl6XDMNF4gTTDnUYBrZrgNEFw7Tfz6lZvuQfHgY7RAZX KJig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YxcdCHBV; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j12-20020a1709066dcc00b009927d850155si2165907ejt.892.2023.08.04.12.40.19; Fri, 04 Aug 2023 12:40:43 -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=@kernel.org header.s=k20201202 header.b=YxcdCHBV; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230297AbjHDTCF (ORCPT + 99 others); Fri, 4 Aug 2023 15:02:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230172AbjHDTBn (ORCPT ); Fri, 4 Aug 2023 15:01:43 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28C5D4C02; Fri, 4 Aug 2023 12:01:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5AEA262107; Fri, 4 Aug 2023 19:01:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46FC6C433CB; Fri, 4 Aug 2023 19:01:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691175698; bh=+aqxYP0WIXKt/aVVR7CXVv0DxplPSOZR8YmmkbVOuh0=; h=From:To:Cc:Subject:Date:From; b=YxcdCHBVvfxp2zhzD+Y41QobKpU37X7K1i9jtKw2hkXvkhe9NHa9KopEtsCdkJN0C YBfTVIicxKTerdTwW9Y5HMThPAddYR24tE+7Gt7876izm87OPwDjoGaZAK8VRnZBey /fnB7mM9u8UsNOu4mJPu/2pkEf8EzU3J7/l7wc7r53mGPIcN5EcgVJIiSGYCeITL9e uYZo9JIFOs4RcvCEikRaggPjQy8JjJXV6AMuCRM0yrW+K+n3oqXUZeOLIMqHF4kdch UuLmrSauE+VNysDLSkHB8UUkKaCSWnrxN8J730o8emfcXk4fQOXXY+MmW93HlntMWY eF4zFaDxIFtvw== Received: (nullmailer pid 1936746 invoked by uid 1000); Fri, 04 Aug 2023 19:01:37 -0000 From: Rob Herring To: Krzysztof Kozlowski , Conor Dooley , Frank Rowand Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] dt: dt-check-compatible: Find struct of_device_id instances with compiler annotations Date: Fri, 4 Aug 2023 13:01:29 -0600 Message-Id: <20230804190130.1936566-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773328708359071367 X-GMAIL-MSGID: 1773328708359071367 The regex search for declarations of struct of_device_id was missing cases that had a compiler annotation such as "__maybe_unused". Improve the regex to allow for these. Use '\S' instead of specific characters to shorten the regex. That also finds some more compatibles using '.' characters. Unfortunately, these changes add ~400 more compatibles without a schema. Signed-off-by: Rob Herring Reviewed-by: Conor Dooley --- scripts/dtc/dt-extract-compatibles | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/dtc/dt-extract-compatibles b/scripts/dtc/dt-extract-compatibles index a1119762ed08..9df9f1face83 100755 --- a/scripts/dtc/dt-extract-compatibles +++ b/scripts/dtc/dt-extract-compatibles @@ -25,8 +25,8 @@ def parse_of_declare_macros(data): def parse_of_device_id(data): """ Find all compatible strings in of_device_id structs """ compat_list = [] - for m in re.finditer(r'of_device_id\s+[a-zA-Z0-9_]+\[\]\s*=\s*({.*?);', data): - compat_list += re.findall(r'\.compatible\s+=\s+"([a-zA-Z0-9_\-,]+)"', m[1]) + for m in re.finditer(r'of_device_id(\s+\S+)?\s+\S+\[\](\s+\S+)?\s*=\s*({.*?);', data): + compat_list += re.findall(r'\.compatible\s+=\s+"(\S+)"', m[3]) return compat_list