Input: palmas-pwrbutton - use bitfield helpers
authorGeert Uytterhoeven <geert+renesas@glider.be>
Mon, 29 Nov 2021 07:55:29 +0000 (23:55 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 29 Nov 2021 08:00:38 +0000 (00:00 -0800)
Use the FIELD_PREP() helper, instead of open-coding the same operation.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/f8831b88346b36fc6e01e0910d0db6c94287d2b4.1637593297.git.geert+renesas@glider.be
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/misc/palmas-pwrbutton.c

index f9b05cf..1e71336 100644 (file)
@@ -15,6 +15,7 @@
  * GNU General Public License for more details.
  */
 
+#include <linux/bitfield.h>
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
@@ -192,8 +193,8 @@ static int palmas_pwron_probe(struct platform_device *pdev)
         * Setup default hardware shutdown option (long key press)
         * and debounce.
         */
-       val = config.long_press_time_val << __ffs(PALMAS_LPK_TIME_MASK);
-       val |= config.pwron_debounce_val << __ffs(PALMAS_PWRON_DEBOUNCE_MASK);
+       val = FIELD_PREP(PALMAS_LPK_TIME_MASK, config.long_press_time_val) |
+             FIELD_PREP(PALMAS_PWRON_DEBOUNCE_MASK, config.pwron_debounce_val);
        error = palmas_update_bits(palmas, PALMAS_PMU_CONTROL_BASE,
                                   PALMAS_LONG_PRESS_KEY,
                                   PALMAS_LPK_TIME_MASK |