Backport new field_prep()/get() particularly useful to handle case where a bitmask is not const and FIELD_PREP can't be used. This permit to replace manual shift with these macro. (also needed to permit backport of some patch without modification) Backport reworked patch that drop the local field_prep()/get() macro in favor of the global one. Link: https://github.com/openwrt/openwrt/pull/22479 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
From bb0e7fda87753a973cb4a86c22905b1177f00d4e Mon Sep 17 00:00:00 2001
|
|
From: Geert Uytterhoeven <geert+renesas@glider.be>
|
|
Date: Thu, 6 Nov 2025 14:34:08 +0100
|
|
Subject: [PATCH] pinctrl: ma35: Convert to common field_{get,prep}() helpers
|
|
|
|
Drop the driver-specific field_get() and field_prep() macros, in favor
|
|
of the globally available variants from <linux/bitfield.h>.
|
|
|
|
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
|
|
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
|
|
Signed-off-by: Yury Norov (NVIDIA) <yury.norov@gmail.com>
|
|
---
|
|
drivers/pinctrl/nuvoton/pinctrl-ma35.c | 6 ------
|
|
1 file changed, 6 deletions(-)
|
|
|
|
--- a/drivers/pinctrl/nuvoton/pinctrl-ma35.c
|
|
+++ b/drivers/pinctrl/nuvoton/pinctrl-ma35.c
|
|
@@ -81,10 +81,6 @@
|
|
#define MVOLT_1800 0
|
|
#define MVOLT_3300 1
|
|
|
|
-/* Non-constant mask variant of FIELD_GET() and FIELD_PREP() */
|
|
-#define field_get(_mask, _reg) (((_reg) & (_mask)) >> (ffs(_mask) - 1))
|
|
-#define field_prep(_mask, _val) (((_val) << (ffs(_mask) - 1)) & (_mask))
|
|
-
|
|
static const char * const gpio_group_name[] = {
|
|
"gpioa", "gpiob", "gpioc", "gpiod", "gpioe", "gpiof", "gpiog",
|
|
"gpioh", "gpioi", "gpioj", "gpiok", "gpiol", "gpiom", "gpion",
|