Commit 12f92ccc authored by Laura Abbott's avatar Laura Abbott Committed by Linus Walleij

gpio: xra1403: Switch to a fixed upper bound for registers

Geert Uytterhoeven pointed out that the number of register was a
fixed upper bound so there's no need to use a dynamically allocated
array in place of a VLA. Use the defined upper bound.
Suggested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 60cc43fc
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#define XRA_REIR 0x10 /* Input Rising Edge Interrupt Enable */ #define XRA_REIR 0x10 /* Input Rising Edge Interrupt Enable */
#define XRA_FEIR 0x12 /* Input Falling Edge Interrupt Enable */ #define XRA_FEIR 0x12 /* Input Falling Edge Interrupt Enable */
#define XRA_IFR 0x14 /* Input Filter Enable/Disable */ #define XRA_IFR 0x14 /* Input Filter Enable/Disable */
#define XRA_LAST 0x15 /* Bounds */
struct xra1403 { struct xra1403 {
struct gpio_chip chip; struct gpio_chip chip;
...@@ -50,7 +51,7 @@ static const struct regmap_config xra1403_regmap_cfg = { ...@@ -50,7 +51,7 @@ static const struct regmap_config xra1403_regmap_cfg = {
.pad_bits = 1, .pad_bits = 1,
.val_bits = 8, .val_bits = 8,
.max_register = XRA_IFR | 0x01, .max_register = XRA_LAST,
}; };
static unsigned int to_reg(unsigned int reg, unsigned int offset) static unsigned int to_reg(unsigned int reg, unsigned int offset)
...@@ -126,21 +127,16 @@ static void xra1403_dbg_show(struct seq_file *s, struct gpio_chip *chip) ...@@ -126,21 +127,16 @@ static void xra1403_dbg_show(struct seq_file *s, struct gpio_chip *chip)
{ {
int reg; int reg;
struct xra1403 *xra = gpiochip_get_data(chip); struct xra1403 *xra = gpiochip_get_data(chip);
int *value; int value[XRA_LAST];
int i; int i;
unsigned int gcr; unsigned int gcr;
unsigned int gsr; unsigned int gsr;
value = kmalloc_array(xra1403_regmap_cfg.max_register, sizeof(*value),
GFP_KERNEL);
if (!value)
return;
seq_puts(s, "xra reg:"); seq_puts(s, "xra reg:");
for (reg = 0; reg <= xra1403_regmap_cfg.max_register; reg++) for (reg = 0; reg <= XRA_LAST; reg++)
seq_printf(s, " %2.2x", reg); seq_printf(s, " %2.2x", reg);
seq_puts(s, "\n value:"); seq_puts(s, "\n value:");
for (reg = 0; reg < xra1403_regmap_cfg.max_register; reg++) { for (reg = 0; reg < XRA_LAST; reg++) {
regmap_read(xra->regmap, reg, &value[reg]); regmap_read(xra->regmap, reg, &value[reg]);
seq_printf(s, " %2.2x", value[reg]); seq_printf(s, " %2.2x", value[reg]);
} }
...@@ -159,7 +155,6 @@ static void xra1403_dbg_show(struct seq_file *s, struct gpio_chip *chip) ...@@ -159,7 +155,6 @@ static void xra1403_dbg_show(struct seq_file *s, struct gpio_chip *chip)
(gcr & BIT(i)) ? "in" : "out", (gcr & BIT(i)) ? "in" : "out",
(gsr & BIT(i)) ? "hi" : "lo"); (gsr & BIT(i)) ? "hi" : "lo");
} }
kfree(value);
} }
#else #else
#define xra1403_dbg_show NULL #define xra1403_dbg_show NULL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment