From patchwork Thu Nov 9 07:51:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 163276 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp278763vqs; Wed, 8 Nov 2023 23:52:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IFeYaytmL91yV7hYHTwPm3xBB7HNDl/oc7lnW8+PzgYs2omCthf381dCNYQh06gINdVaP3O X-Received: by 2002:a17:902:f68c:b0:1cc:3bc5:d259 with SMTP id l12-20020a170902f68c00b001cc3bc5d259mr5760693plg.30.1699516335538; Wed, 08 Nov 2023 23:52:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699516335; cv=none; d=google.com; s=arc-20160816; b=i/iXBt9174L2CnqxIt2vQMZrTFDhu/KlO9jtf+KM5D1ZKAxyLwP3uQsveqU7Atoabz 6oqXUIuuYQO5k0puhob6YXTCuvpqAFMapUx8fTbWr02NymVkD5wlDf0EnVQYBLMO0TaI I+5TqT5/qYOBd+kLgvfkpI8Zv53eORQ4hT42KzsG1c0s7iE8dLCUx/Dn16Fe1/AO94xp xr6c1evoc6Kt+eVCF9pbrNLtbQqcoRIzJ7xU4Yh/0vPtA8ewRjQsFT5owf7z9QUS/feM 9Ws2YUQZgs5bNE2eptCTYOSOF9bl6qsdZdBwem/EjGOXAYVDyot7mOZNSZgErQ2QJSMN DD1g== 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=n8kI9UwJGdReYGKa944trNcHcU3YT757mZ4WuJyOmf4=; fh=HbiKhOCWoXE86gK05zxRZK/9yY8Dz5GxbOL1Su6ZhRU=; b=OuTJcpotHpVJCg5XlHUA6NbS3vjeCt3DXZJmIwYuGODhBLwPpYT58nNNw1sENr0foV vQ6+314lxHHHSFWK9ifecxwpFrPzYruWICeHPqz7fwnBqabkginMysruhZpPdNxb1WcH JN+A41alvT7BnHFGWJIb9CPYnParj2vJiOUGJpNfGjSF+v4olC0G88Mh7UYGSaPWGJHo geazO4ygsFkuNI1HAx2yIipfHDKlUyFph3iB0QZG5Vf1aiQ8NuByjQFuU+kWJa2IhLVw vXV9HEh0N1W/Fc9GbZg1CeXCFVSY/6smuO47a0lA9BqidESW5IGJ3JXg5kBHbg1h0D/W ZuIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=NyKLgokm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id i9-20020a17090332c900b001cc2216e87bsi4635570plr.351.2023.11.08.23.52.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 23:52:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=NyKLgokm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 44A3783BFC72; Wed, 8 Nov 2023 23:52:13 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233115AbjKIHwD (ORCPT + 32 others); Thu, 9 Nov 2023 02:52:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232992AbjKIHwB (ORCPT ); Thu, 9 Nov 2023 02:52:01 -0500 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B07719A3 for ; Wed, 8 Nov 2023 23:51:59 -0800 (PST) Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-6b44befac59so1330402b3a.0 for ; Wed, 08 Nov 2023 23:51:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699516319; x=1700121119; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=n8kI9UwJGdReYGKa944trNcHcU3YT757mZ4WuJyOmf4=; b=NyKLgokmqH2Wh86sbPRwnkVgIiX6af8Nr5tukVIxo5Y5S/Zgzztj57X380x9lYahi2 UOkNprM/NaQegajEAYBuL3xy1BKIQCfVDJQNfolBjUDKnDAs+0d/uOdWOiAHsWvjGsOE vPbUh7eVBslQkLNKGl1R1Q9CCuP4UvlUmsx0Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699516319; x=1700121119; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=n8kI9UwJGdReYGKa944trNcHcU3YT757mZ4WuJyOmf4=; b=SCf5f+RyWJSerteCQNQn2JweqqfYngzjcZyFMCF7MxH1CIP8IC989PRSu/pftVV0ol Qlf8awt9MgzcX1bGTeQcf9w5pQHgdMQdAIuGyg2nnuIBksRABGADkYZxQL9DFMJNXreg Ar3FSODEHKCfmGRQhRIyLKJ2q4UvraatvyZv4Z1Slcb8CC7uIaw65+R5l7bhSxmoImMP a+kjP8pBJ0kDmCQCJKNW50Yohu1vnswVOJz9BwulrxCskRQ7J4/nbQavZSIQcXTDO7KJ 9Y49D5/VyDBKpVJ3bAy3UuQyFlrpb8lzNAoAhssvDUPYww7Mbmw7+3BqKILOdY64W4lr +Sbw== X-Gm-Message-State: AOJu0YzhmFMFCs6vpv1ddi0rHt4m6C+irmTLGyS+8kWaH3ojARxWUtcE by0rkuQmLCAS7nhERfzS4Pt/Rw== X-Received: by 2002:a05:6a21:6d90:b0:181:8654:8284 with SMTP id wl16-20020a056a216d9000b0018186548284mr9852558pzb.24.1699516319028; Wed, 08 Nov 2023 23:51:59 -0800 (PST) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:30b0:eade:dcc0:28e8]) by smtp.gmail.com with ESMTPSA id h25-20020aa786d9000000b006be047268d5sm10418692pfo.174.2023.11.08.23.51.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 23:51:58 -0800 (PST) From: Sergey Senozhatsky To: Andy Whitcroft , Joe Perches Cc: Dwaipayan Ray , Lukas Bulwahn , linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH] checkpatch: do not require an empty line before error injection Date: Thu, 9 Nov 2023 16:51:38 +0900 Message-ID: <20231109075147.2779461-1-senozhatsky@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 08 Nov 2023 23:52:13 -0800 (PST) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782072041079216582 X-GMAIL-MSGID: 1782072041079216582 ALLOW_ERROR_INJECTION macro (just like EXPORT_SYMBOL) can immediately follow a function it annotates. Signed-off-by: Sergey Senozhatsky Acked-by: Joe Perches --- scripts/checkpatch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 25fdb7fda112..a94ed6c46a6d 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -4054,7 +4054,7 @@ sub process { if ($prevline =~ /^[\+ ]};?\s*$/ && $line =~ /^\+/ && !($line =~ /^\+\s*$/ || - $line =~ /^\+\s*(?:EXPORT_SYMBOL|early_param)/ || + $line =~ /^\+\s*(?:EXPORT_SYMBOL|early_param|ALLOW_ERROR_INJECTION)/ || $line =~ /^\+\s*MODULE_/i || $line =~ /^\+\s*\#\s*(?:end|elif|else)/ || $line =~ /^\+[a-z_]*init/ ||