Skip to content

Commit

Permalink
pinctrl: sh-pfc: Constify enum_ids and var_field_width compound literals
Browse files Browse the repository at this point in the history
The enum_ids and var_field_width fields of struct pinmux_data_reg and
pinmux_cfg_reg are initialized using compound literals. Cast them to
const to store them in .rodata.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Laurent Pinchart authored and Linus Walleij committed Dec 20, 2013
1 parent e476e77 commit 9aecff5
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/pinctrl/sh-pfc/sh_pfc.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,13 @@ struct pinmux_cfg_reg {

#define PINMUX_CFG_REG(name, r, r_width, f_width) \
.reg = r, .reg_width = r_width, .field_width = f_width, \
.enum_ids = (u16 [(r_width / f_width) * (1 << f_width)])
.enum_ids = (const u16 [(r_width / f_width) * (1 << f_width)])

#define PINMUX_CFG_REG_VAR(name, r, r_width, var_fw0, var_fwn...) \
.reg = r, .reg_width = r_width, \
.var_field_width = (unsigned long [r_width]) { var_fw0, var_fwn, 0 }, \
.enum_ids = (u16 [])
.var_field_width = (const unsigned long [r_width]) \
{ var_fw0, var_fwn, 0 }, \
.enum_ids = (const u16 [])

struct pinmux_data_reg {
unsigned long reg, reg_width;
Expand All @@ -90,7 +91,7 @@ struct pinmux_data_reg {

#define PINMUX_DATA_REG(name, r, r_width) \
.reg = r, .reg_width = r_width, \
.enum_ids = (u16 [r_width]) \
.enum_ids = (const u16 [r_width]) \

struct pinmux_irq {
int irq;
Expand Down

0 comments on commit 9aecff5

Please sign in to comment.