From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Dec 2025 17:01:27 +0000 (-0800)
Subject: Merge tag 'bitmap-for-6.19' of github.com:/norov/linux
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f468cf53c5240bf5063d0c6fe620b5ae2de37801;p=thirdparty%2Flinux.git

Merge tag 'bitmap-for-6.19' of github.com:/norov/linux

Pull bitmap updates from Yury Norov:

 - Runtime field_{get,prep}() (Geert)

 - Rust ID pool updates (Alice)

 - min_t() simplification (David)

 - __sw_hweightN kernel-doc fixes (Andy)

 - cpumask.h headers cleanup (Andy)

* tag 'bitmap-for-6.19' of github.com:/norov/linux: (32 commits)
  rust_binder: use bitmap for allocation of handles
  rust: id_pool: do not immediately acquire new ids
  rust: id_pool: do not supply starting capacity
  rust: id_pool: rename IdPool::new() to with_capacity()
  rust: bitmap: add BitmapVec::new_inline()
  rust: bitmap: add MAX_LEN and MAX_INLINE_LEN constants
  cpumask: Don't use "proxy" headers
  soc: renesas: Use bitfield helpers
  clk: renesas: Use bitfield helpers
  ALSA: usb-audio: Convert to common field_{get,prep}() helpers
  soc: renesas: rz-sysc: Convert to common field_get() helper
  pinctrl: ma35: Convert to common field_{get,prep}() helpers
  iio: mlx90614: Convert to common field_{get,prep}() helpers
  iio: dac: Convert to common field_prep() helper
  gpio: aspeed: Convert to common field_{get,prep}() helpers
  EDAC/ie31200: Convert to common field_get() helper
  crypto: qat - convert to common field_get() helper
  clk: at91: Convert to common field_{get,prep}() helpers
  bitfield: Add non-constant field_{prep,get}() helpers
  bitfield: Add less-checking __FIELD_{GET,PREP}()
  ...
---

f468cf53c5240bf5063d0c6fe620b5ae2de37801
diff --cc drivers/gpio/gpio-aspeed.c
index 2e0ae953dd996,3da999334971d..cbdf781994dce
--- a/drivers/gpio/gpio-aspeed.c
+++ b/drivers/gpio/gpio-aspeed.c
@@@ -29,11 -30,8 +30,7 @@@
   * access to some GPIOs and to arbitrate between coprocessor and ARM.
   */
  #include <linux/gpio/consumer.h>
 -#include "gpiolib.h"
  
- /* 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))
- 
  #define GPIO_G7_IRQ_STS_BASE 0x100
  #define GPIO_G7_IRQ_STS_OFFSET(x) (GPIO_G7_IRQ_STS_BASE + (x) * 0x4)
  #define GPIO_G7_CTRL_REG_BASE 0x180