summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/sh-pfc
diff options
context:
space:
mode:
authorGeert Uytterhoeven2018-12-18 09:31:49 +0100
committerGeert Uytterhoeven2019-04-02 09:58:04 +0200
commitc481c8178420b8cc8b188807fe6eee8b069ce2d8 (patch)
treeca61ce438d43f3af5541b23e6ba7146c90c04ebd /drivers/pinctrl/sh-pfc
parentpinctrl: sh-pfc: Absorb enum IDs in PINMUX_DATA_REG() macro (diff)
downloadkernel-qcow2-linux-c481c8178420b8cc8b188807fe6eee8b069ce2d8.tar.gz
kernel-qcow2-linux-c481c8178420b8cc8b188807fe6eee8b069ce2d8.tar.xz
kernel-qcow2-linux-c481c8178420b8cc8b188807fe6eee8b069ce2d8.zip
pinctrl: sh-pfc: Validate enum IDs for regs with fixed-width fields
Add build-time checks to the PINMUX_CFG_REG() and PINMUX_DATA_REG() macros, to ensure the number of provided enum IDs is correct. This helps catching bugs early. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Diffstat (limited to 'drivers/pinctrl/sh-pfc')
-rw-r--r--drivers/pinctrl/sh-pfc/sh_pfc.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h
index 57e13b623b2e..31acde5032a0 100644
--- a/drivers/pinctrl/sh-pfc/sh_pfc.h
+++ b/drivers/pinctrl/sh-pfc/sh_pfc.h
@@ -130,7 +130,9 @@ struct pinmux_cfg_reg {
*/
#define PINMUX_CFG_REG(name, r, r_width, f_width, ids) \
.reg = r, .reg_width = r_width, \
- .field_width = f_width + BUILD_BUG_ON_ZERO(r_width % f_width), \
+ .field_width = f_width + BUILD_BUG_ON_ZERO(r_width % f_width) + \
+ BUILD_BUG_ON_ZERO(sizeof((const u16 []) { ids }) / sizeof(u16) != \
+ (r_width / f_width) * (1 << f_width)), \
.enum_ids = (const u16 [(r_width / f_width) * (1 << f_width)]) \
{ ids }
@@ -196,7 +198,9 @@ struct pinmux_data_reg {
* enum ID must be specified, all wrapped using the GROUP() macro.
*/
#define PINMUX_DATA_REG(name, r, r_width, ids) \
- .reg = r, .reg_width = r_width, \
+ .reg = r, .reg_width = r_width + \
+ BUILD_BUG_ON_ZERO(sizeof((const u16 []) { ids }) / sizeof(u16) != \
+ r_width), \
.enum_ids = (const u16 [r_width]) { ids }
struct pinmux_irq {