[PATCH -next v5 10/23] iio: imu: smi330: #undef field_{get,prep}() before definition
Jonathan Cameron
jic23 at kernel.org
Sun Nov 2 21:43:26 AEDT 2025
On Mon, 27 Oct 2025 19:41:44 +0100
Geert Uytterhoeven <geert+renesas at glider.be> 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 <yury.norov at gmail.com>
> Signed-off-by: Geert Uytterhoeven <geert+renesas at glider.be>
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) { \
More information about the Linux-aspeed
mailing list