diff options
| author | Axel Lin <axel.lin@ingics.com> | 2014-03-04 18:20:14 +0800 |
|---|---|---|
| committer | Robin Gong <b38343@freescale.com> | 2014-05-26 14:00:50 +0800 |
| commit | dad7af375d326c2e548b34f26f9d3a5015c601d2 (patch) | |
| tree | e11063a3d448e01e0a03f62995a9e43a02590460 | |
| parent | 792bf1121e9f1f2e333e9ce6b13b55c4e8eee1cf (diff) | |
regulator: pfuze100: Add terminate entry for [i2c|of]_device_id tables
Also remove PFUZE_NUM to avoid below build warnings:
CC [M] drivers/regulator/pfuze100-regulator.o
drivers/regulator/pfuze100-regulator.c:86:2: warning: excess elements in array initializer [enabled by default]
drivers/regulator/pfuze100-regulator.c:86:2: warning: (near initialization for 'pfuze_device_id') [enabled by default]
drivers/regulator/pfuze100-regulator.c:93:2: warning: excess elements in array initializer [enabled by default]
drivers/regulator/pfuze100-regulator.c:93:2: warning: (near initialization for 'pfuze_dt_ids') [enabled by default]
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit e6c4c3378d82c5eeb136ed06b1a23651bcdaf739)
(cherry picked from commit 12c7dd7c396378fd6dc907903a4ae540a75b31f5)
| -rw-r--r-- | drivers/regulator/pfuze100-regulator.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c index 35b1de1c8cc0..0f4924e04a5d 100644 --- a/drivers/regulator/pfuze100-regulator.c +++ b/drivers/regulator/pfuze100-regulator.c @@ -56,7 +56,7 @@ #define PFUZE100_VGEN5VOL 0x70 #define PFUZE100_VGEN6VOL 0x71 -enum chips {PFUZE100, PFUZE200, PFUZE_NUM}; +enum chips { PFUZE100, PFUZE200 }; struct pfuze_regulator { struct regulator_desc desc; @@ -80,15 +80,17 @@ static const int pfuze100_vsnvs[] = { 1000000, 1100000, 1200000, 1300000, 1500000, 1800000, 3000000, }; -static const struct i2c_device_id pfuze_device_id[PFUZE_NUM] = { +static const struct i2c_device_id pfuze_device_id[] = { {.name = "pfuze100", .driver_data = PFUZE100}, {.name = "pfuze200", .driver_data = PFUZE200}, + { } }; MODULE_DEVICE_TABLE(i2c, pfuze_device_id); -static const struct of_device_id pfuze_dt_ids[PFUZE_NUM] = { +static const struct of_device_id pfuze_dt_ids[] = { { .compatible = "fsl,pfuze100", .data = (void *)PFUZE100}, { .compatible = "fsl,pfuze200", .data = (void *)PFUZE200}, + { } }; MODULE_DEVICE_TABLE(of, pfuze_dt_ids); |