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 Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B4D7BCCF9E3 for ; Sun, 2 Nov 2025 10:43:48 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4czrtB0wqbz30RN; Sun, 2 Nov 2025 21:43:46 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2600:3c0a:e001:78e:0:1991:8:25" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1762080226; cv=none; b=FY+Hc5UwJY3vBKhwwF/fgXjpW0faX5/AOsY/TBbkcHR5vA8gVMVe3tkKkekGH2o24/OaGPqDfGDS8uiKP25HtyeDDBl6/zoxs8hUr7IOWZPztjqGvpA/W1FgWyaHK3jXorjedoOgZfF/rq5AlbC+4YVjdm2uGH+vxtA81Bo7baQtyKIyT/mgQiee7Ha73LOWFGX1RdT7+vWYBJqXsD9p/u6xlTu6nTiyVwqrwODhHWyS119nFT+YjQVerhAsNs7kwNl2citXj019jK8eyO61POSMSkzrli1xen2MBE1GdvVQ44mdiBu1Bz9sJyRj7Yl2bPN4R6kb0N1w9iZCGOEK4g== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1762080226; c=relaxed/relaxed; bh=savaLyPDvBOnmVDyuiCvDMf6GyKw9sbQTTxf9OC2yKA=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BYnGZFIS+eHuAW7F60KyzfL/4gdNJjMUUciOQLCgaEX13MbP8243rjPGmOI6bI2bN+CrX5eDfw67hHXZuF+nTILXZjbkztG9evuxun/vLCkRbjAyTsLFOBS8Wh5MA9sY9s7k9hdcPkcSmS+2MtYUZYv3KjNg5FPoEYAcHJQoyqm6xNP6F4a7wk/bxz9qlzx0yaOAyYfgtL/FZ4dYVuO+Fhse3jU5oNypF+knTJLcO2hNRsYVL9iwflalJZb9krUMt4hvi8ZQs3vgbPkbj8AxESxsnMr6Y0wW3nwiteZHrpGIPe+qEKj+UGafW4ZFF7LX4pGxXpWHZtJDew/TfXF/4A== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=YojVFjn8; dkim-atps=neutral; spf=pass (client-ip=2600:3c0a:e001:78e:0:1991:8:25; helo=sea.source.kernel.org; envelope-from=jic23@kernel.org; receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=YojVFjn8; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=2600:3c0a:e001:78e:0:1991:8:25; helo=sea.source.kernel.org; envelope-from=jic23@kernel.org; receiver=lists.ozlabs.org) Received: from sea.source.kernel.org (sea.source.kernel.org [IPv6:2600:3c0a:e001:78e:0:1991:8:25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4czrt85y1Bz2ytT for ; Sun, 2 Nov 2025 21:43:44 +1100 (AEDT) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id A2ADD43274; Sun, 2 Nov 2025 10:43:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E047CC4CEF7; Sun, 2 Nov 2025 10:43:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1762080221; bh=4u8d6QQgjLsALEyZL0hM355ahA8pgo9Ke2RDvhyV/FU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=YojVFjn8WsOc90BQ7IjaCvSpawTY/iFM2EPhYDD5dnGWRgy1V9yvL/MEqZ0TtAlR7 bOb/fXVYiil59qXvBq/U3REBPlb5nBkGwDqRIYMBz5I0KEBRnvT5ZEiaYzNyd6y9Zf 5IIUOWr69e6TstOOUFAcseA/Uh3WnpVn2+gfAVjCfVQRnOUA5ypJyOfrOHReuHp7Sg WGYh/9kMA2mX62kCZYu70IxtgYDcwIcClH+HreNxArWG+BioiWd94cJCtOu6NOrbBI 1yerwBgfvmBsmLmV1VasI237/BiNNQOhrrQMTL8p3/eC2uQh+6fEkO+1LfX3YVL0KT 1QsxP0qktpdJg== Date: Sun, 2 Nov 2025 10:43:26 +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: <20251102104326.0f1db96a@jic23-huawei> In-Reply-To: <97549838f28a1bb7861cfb42ee687f832942b13a.1761588465.git.geert+renesas@glider.be> References: <97549838f28a1bb7861cfb42ee687f832942b13a.1761588465.git.geert+renesas@glider.be> X-Mailer: Claws Mail 4.3.1 (GTK 3.24.51; x86_64-pc-linux-gnu) X-Mailing-List: linux-aspeed@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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. > -- > v5: > - New. > --- > drivers/iio/imu/smi330/smi330_core.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/iio/imu/smi330/smi330_core.c b/drivers/iio/imu/smi330/smi330_core.c > index d9178725ade3da83..a79964fe68fadf47 100644 > --- 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) { \