From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D941E2EBBA1; Sun, 9 Nov 2025 13:01:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762693286; cv=none; b=nvNqdFmtuUM4mQmr3oV8rHyH1/AV+UxWRXghRGrGZLa2Spv8lyPbw8gKabjsc5IKHCOSTpnOTIKYSiswlCWZYikn//BeU9ZALLT6i/IzyYk3vXa1yvtPxFt0EiBujcXGTt4+Ntg/0prlWbBWmZZgx1NBGwL6BOVlEjvc/CA9etc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762693286; c=relaxed/simple; bh=zNi9nu3L6TvcyXChQiHADlE5BR7XOd1UsthZfvb4G1U=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Wj8zfwqS3bH9wFQQVkAwJ+fiul/J2EAI+3DWzK893jB/y+yllBK4B9G0G/BBpIY38/OaX5vrvKI/PuWlpcrRzJb4B2HCuJv1zqDCS3O8036GHVZ+Gf/jKulM4bRhp2oJ78X0fAyZp92u0LtrD3CmC0qfnb3z8FfRhT2bQ5jrcfI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EiUmTl27; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EiUmTl27" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6BF3C4CEF8; Sun, 9 Nov 2025 13:00:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1762693285; bh=zNi9nu3L6TvcyXChQiHADlE5BR7XOd1UsthZfvb4G1U=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=EiUmTl27nujv51T7if+PVcEwebMCbQCSCq+8xYpaEYI85RENWVNiRhQBbcZizkEcl BoNN96p+WxmZf8XdtZd2JsH89A3j92nUV/nviNZBdoUa+JlTXZfeI1MheP7j0cuQVS h92D51+L7hZ918wSo/TloZRFQb8IuVvMFsY/0olkMlPlIk7n0h9fCRAkSB/zrNZYUy o4R3RMn97X9Qp2F9/enYc19Uabz3of7vben/btpQkQj13pd57/4mn4NtxOfAoZl9rB nGuOIb3srFqktlT4NZZ/24ryLC2SYkCUPIwvyjQnO0esl0QpJC6RsjhO0psREWxDAE TbMdryqtL/QNQ== Date: Sun, 9 Nov 2025 12:59:56 +0000 From: Jonathan Cameron To: Geert Uytterhoeven Cc: Michael Turquette , Stephen Boyd , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Giovanni Cabiddu , Herbert Xu , David Miller , Linus Walleij , Bartosz Golaszewski , Joel Stanley , Andrew Jeffery , Crt Mori , Lars-Peter Clausen , Jacky Huang , Shan-Chun Hung , Yury Norov , Rasmus Villemoes , Jaroslav Kysela , Takashi Iwai , Johannes Berg , Jakub Kicinski , Alex Elder , David Laight , Vincent Mailhol , Jason Baron , Borislav Petkov , Tony Luck , Michael Hennerich , Kim Seer Paller , David Lechner , Nuno =?UTF-8?B?U8Oh?= , Andy Shevchenko , Richard Genoud , Cosmin Tanislav , Biju Das , Jianping Shen , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux-crypto@vger.kernel.org, linux-edac@vger.kernel.org, qat-linux@intel.com, linux-gpio@vger.kernel.org, linux-aspeed@lists.ozlabs.org, linux-iio@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH -next v5 10/23] iio: imu: smi330: #undef field_{get,prep}() before definition Message-ID: <20251109125956.106c9a1a@jic23-huawei> In-Reply-To: References: <97549838f28a1bb7861cfb42ee687f832942b13a.1761588465.git.geert+renesas@glider.be> <20251102104326.0f1db96a@jic23-huawei> X-Mailer: Claws Mail 4.3.1 (GTK 3.24.51; x86_64-pc-linux-gnu) Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Mon, 3 Nov 2025 11:09:36 +0100 Geert Uytterhoeven wrote: > Hi Jonathan, > > On Sun, 2 Nov 2025 at 11:43, Jonathan Cameron wrote: > > On Mon, 27 Oct 2025 19:41:44 +0100 > > Geert Uytterhoeven wrote: > > > > > Prepare for the advent of globally available common field_get() and > > > field_prep() macros by undefining the symbols before defining local > > > variants. This prevents redefinition warnings from the C preprocessor > > > when introducing the common macros later. > > > > > > Suggested-by: Yury Norov > > > Signed-off-by: Geert Uytterhoeven > > > > So this is going to make a mess of merging your series given this is > > queued up for next merge window. > > > > I can pick this one up perhaps and we loop back to the replacement of > > these in a future patch? Or perhaps go instead with a rename > > of these two which is probably nicer in the intermediate state than > > undefs. > > Renaming would mean a lot of churn. > Just picking up the #undef patch should be simple and safe? The > removal of the underf and redef can be done in the next cycle. > Thanks! Only 1 call of each of these in the driver, so churn is small either way. To avoid a bisection problem if your tree merges first I need to modify this stuff in the original patch or leave it for Linus to deal with as a merge conflict resolution which is mess I'd rather do without. So I'll rebase now and rename these functions to have an smi330_ prefix. Better to potentially cause people problems when I have 23 patches on top of this (and hopefully no one is based on those yet) than when I have many more. So tweaked and pushed out a new version where this patch isn't needed. We can move to your new code next cycle. Jonathan > > > > --- a/drivers/iio/imu/smi330/smi330_core.c > > > +++ b/drivers/iio/imu/smi330/smi330_core.c > > > @@ -68,7 +68,9 @@ > > > #define SMI330_SOFT_RESET_DELAY 2000 > > > > > > /* Non-constant mask variant of FIELD_GET() and FIELD_PREP() */ > > > +#undef field_get > > > #define field_get(_mask, _reg) (((_reg) & (_mask)) >> (ffs(_mask) - 1)) > > > +#undef field_prep > > > #define field_prep(_mask, _val) (((_val) << (ffs(_mask) - 1)) & (_mask)) > > > > > > #define SMI330_ACCEL_CHANNEL(_axis) { \ > > Gr{oetje,eeting}s, > > Geert >