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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 0A447C433B4 for ; Fri, 21 May 2021 09:02:50 +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 94B03613AC for ; Fri, 21 May 2021 09:02:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94B03613AC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.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=DjiGp6N56qWsUJvPFdjpzIHv3Z+t6CU9/iFEU1zjqhE=; b=gd/9cjotJTJtkijXb13AKDo84W EtGpu1HXT8chsYBHOqpakfVyKbkKKg2Mau3R1tNJr9uXGpHDThmoRxNXZWkHWE1GoDWFRDsNnUNsK whtcLjMN5YZXHIlfTN3UefxKZUNInm5hgKM/RhyWXC9J1rBio9pzALnSwv5kI9Ftg7rcMu+oY5k49 sctfyrXS0V0W36ytpAjGXUCTGDMDN8Zm98f57hhjjyA7F2Uovh9aOAoWVLFoE18qsUGRRHmQJmx2v 0PJDSzjda/BWl5hJBsJpFgo9ZhDGe8ZuOtPAVOjGq3WZfh6RjLYnhK86anALW7Ol9MIgc/NhNmL5F vVHDHUGw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lk11y-004aMM-ND; Fri, 21 May 2021 09:01:19 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lk10G-004Znq-5S for linux-arm-kernel@desiato.infradead.org; Fri, 21 May 2021 08:59:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=9VVK8/1KColE59Xv+mm8AL8uAr/GCHzBnr8zfukNEnQ=; b=apxgG4PcfvFOAHqlaHz8J2WiMQ /gGlqsqqPEWy6AUdO1S5kqWxflGlxiz8DCBNQxqsOjntlsIKZI7tXXMui5dKjAlGEK1LwYpVXdwAr e4RvVjqOa1IiX8kUNU/hA34IJogkjkjXHENmc8rakA49/gIXK7aTgiMYIK1xcv3/37GCS7wm3MFkd efa6cAL+yr1g6sL36Ic785bYwdvAJIVSYmkb0b4s9lcjVakJ8MzBKlcj0qvdnn7NlxMCKdH3ezZK3 bY3JcDmYWWBQQjn/mhUAeo27YphC6Lqs9Z1x54aPUI5GEUVOWpfloJhRdrk9wXDjt1rlfj6ogTqoC JHIDeKWQ==; Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lk10D-00Gy11-Ix for linux-arm-kernel@lists.infradead.org; Fri, 21 May 2021 08:59:30 +0000 Received: by mail-pg1-x52d.google.com with SMTP id 27so12412754pgy.3 for ; Fri, 21 May 2021 01:59:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9VVK8/1KColE59Xv+mm8AL8uAr/GCHzBnr8zfukNEnQ=; b=tzlpR0iZmoOnnL3HUU+5tU3XVVpaO9lr4EYeRCULCPKhd9atNaueRaBVMauwxoFL3V guhGiDAcC93SbpTyCmq3CAMSpk1TCWpnoU/dPnHUUrydMd0M7RMjARdrZtNa3NGiez8q AVq8u7a+Mnsa364kIM7Y7P0cyYqGmtBaXnQms7iTyb18Cg9IOhp5ynXqI/WzUs00R/pL eXqqNda9L1/0HUusHsWegsA6GENsNCUYPjTnA0AQaUX/lbrodTJ+2z3QxNIbaoDmjVz8 JTlBX7e79sqyjxLNYmhwUNNBfoFU8FspEUnIP2s+8LP35yVAzTjhn/0LW4lS/o1SQuc/ WTcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9VVK8/1KColE59Xv+mm8AL8uAr/GCHzBnr8zfukNEnQ=; b=j60LoC4o9LB+Gdx5eDpZec1ucfZcll/sj8V2cYnz+DTqxwsHnmuK5e1Qa36kMzbSSm oo4p+9670Uu+B6q53WGicYq8HapRYekA+bgFal2JTyF0mpYu9mPrXUVzhLtpGz4z5kaT rTvVUYeUJ7WDIqGwO805qpnt7fpNS4Rtz8r5P7sFx2hnBJ8awG3TkhdsgmunJAc95LmO ac9gjdUwYhTzBlTAuNZzBdE7FdnNCaBYwzZ3SbQZlWEcZmjBfNN8hJCUTI+Mdy68uNpA B4BhqR0MF3gv8rX58Oyaw3/PkyxPkjXbQJoPm75PpSqSTEvl1TkVWP09IwVQpaKerRTq WiBg== X-Gm-Message-State: AOAM53183Lv/EcvXU7xqeF+0Wj44TdZg8USMiAZ2sbatU0k1zFObTR4Q phkjlD077cRgykmi4BKa6Oo= X-Google-Smtp-Source: ABdhPJyc9Jyz5l4cpY6SfZOEGuvmlCLat0me4TBWH+8q7gJMiyUN/NrNb6qzjrqqQCVYZ1W+qfk04g== X-Received: by 2002:a62:e21a:0:b029:2de:4440:3a with SMTP id a26-20020a62e21a0000b02902de4440003amr9052894pfi.23.1621587568515; Fri, 21 May 2021 01:59:28 -0700 (PDT) Received: from pride.localdomain (c-174-61-140-56.hsd1.wa.comcast.net. [174.61.140.56]) by smtp.gmail.com with ESMTPSA id q3sm3914489pff.142.2021.05.21.01.59.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 May 2021 01:59:28 -0700 (PDT) From: Joe Richey To: trivial@kernel.org Cc: Joe Richey , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Paolo Bonzini , Mark Rutland , Lorenzo Pieralisi , Mauro Carvalho Chehab , Zhangfei Gao , Zhou Wang , Andy Whitcroft , Joe Perches , Dwaipayan Ray , Lukas Bulwahn , Sasha Levin , "Chang S. Bae" , Andi Kleen , Peter Xu , Lei Cao , Ulf Hansson , Daniel Lezcano , "Rafael J. Wysocki" , Jean-Philippe Brucker , Zaibo Xu , Greg Kroah-Hartman , Hans Verkuil , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-accelerators@lists.ozlabs.org Subject: [PATCH v2 7/7] checkpatch: suggest _BITULL() and _BITUL() for UAPI headers Date: Fri, 21 May 2021 01:58:48 -0700 Message-Id: <20210521085849.37676-8-joerichey94@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210521085849.37676-1-joerichey94@gmail.com> References: <20210520104343.317119-1-joerichey94@gmail.com> <20210521085849.37676-1-joerichey94@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210521_015929_679299_BB3D00FB X-CRM114-Status: GOOD ( 16.34 ) 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 From: Joe Richey Instead of just ignoring UAPI headers, reccomend the UAPI compatible macros if a user adds something that looks like (1 << n). Normal kernel code will continue to get BIT_ULL() and BIT() reccomended. This change also modifies the $realfile regex to match headers that have "include/uapi" anywhere in their path so paths like: tools/include/uapi/linux/kvm.h arch/x86/include/uapi/asm/hwcap2.h get recognized as UAPI headers. Signed-off-by: Joe Richey --- scripts/checkpatch.pl | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index d65334588eb4..47edc61b74c2 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -7020,15 +7020,17 @@ sub process { } } -# check for #defines like: 1 << that could be BIT(digit), it is not exported to uapi - if ($realfile !~ m@^include/uapi/@ && - $line =~ /#\s*define\s+\w+\s+\(?\s*1\s*([ulUL]*)\s*\<\<\s*(?:\d+|$Ident)\s*\)?/) { - my $ull = ""; - $ull = "_ULL" if (defined($1) && $1 =~ /ll/i); +# check for #defines like: 1 << that could be BIT(digit) or similar + if ($line =~ /#\s*define\s+\w+\s+\(?\s*1\s*([ulUL]*)\s*\<\<\s*(?:\d+|$Ident)\s*\)?/) { + my $ull = (defined($1) && $1 =~ /ll/i); + my $macroname = $ull ? "BIT_ULL" : "BIT"; + if ($realfile =~ m@include/uapi/@) { + $macroname = $ull ? "_BITULL" : "_BITUL"; + } if (CHK("BIT_MACRO", - "Prefer using the BIT$ull macro\n" . $herecurr) && + "Prefer using the $macroname macro\n" . $herecurr) && $fix) { - $fixed[$fixlinenr] =~ s/\(?\s*1\s*[ulUL]*\s*<<\s*(\d+|$Ident)\s*\)?/BIT${ull}($1)/; + $fixed[$fixlinenr] =~ s/\(?\s*1\s*[ulUL]*\s*<<\s*(\d+|$Ident)\s*\)?/${macroname}($1)/; } } -- 2.31.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel