aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-03-04 05:20:14 -0500
committerMark Brown <broonie@linaro.org>2014-03-04 05:46:55 -0500
commite6c4c3378d82c5eeb136ed06b1a23651bcdaf739 (patch)
tree2a37764e95f32de124f06e39222adb6476961014
parentf2518480c7b744296a5587990a54e3a284d932b8 (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>
-rw-r--r--drivers/regulator/pfuze100-regulator.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c
index ef330e69336a..f81c5bffbbf9 100644
--- a/drivers/regulator/pfuze100-regulator.c
+++ b/drivers/regulator/pfuze100-regulator.c
@@ -56,7 +56,7 @@
56#define PFUZE100_VGEN5VOL 0x70 56#define PFUZE100_VGEN5VOL 0x70
57#define PFUZE100_VGEN6VOL 0x71 57#define PFUZE100_VGEN6VOL 0x71
58 58
59enum chips {PFUZE100, PFUZE200, PFUZE_NUM}; 59enum chips { PFUZE100, PFUZE200 };
60 60
61struct pfuze_regulator { 61struct pfuze_regulator {
62 struct regulator_desc desc; 62 struct regulator_desc desc;
@@ -80,15 +80,17 @@ static const int pfuze100_vsnvs[] = {
80 1000000, 1100000, 1200000, 1300000, 1500000, 1800000, 3000000, 80 1000000, 1100000, 1200000, 1300000, 1500000, 1800000, 3000000,
81}; 81};
82 82
83static const struct i2c_device_id pfuze_device_id[PFUZE_NUM] = { 83static const struct i2c_device_id pfuze_device_id[] = {
84 {.name = "pfuze100", .driver_data = PFUZE100}, 84 {.name = "pfuze100", .driver_data = PFUZE100},
85 {.name = "pfuze200", .driver_data = PFUZE200}, 85 {.name = "pfuze200", .driver_data = PFUZE200},
86 { }
86}; 87};
87MODULE_DEVICE_TABLE(i2c, pfuze_device_id); 88MODULE_DEVICE_TABLE(i2c, pfuze_device_id);
88 89
89static const struct of_device_id pfuze_dt_ids[PFUZE_NUM] = { 90static const struct of_device_id pfuze_dt_ids[] = {
90 { .compatible = "fsl,pfuze100", .data = (void *)PFUZE100}, 91 { .compatible = "fsl,pfuze100", .data = (void *)PFUZE100},
91 { .compatible = "fsl,pfuze200", .data = (void *)PFUZE200}, 92 { .compatible = "fsl,pfuze200", .data = (void *)PFUZE200},
93 { }
92}; 94};
93MODULE_DEVICE_TABLE(of, pfuze_dt_ids); 95MODULE_DEVICE_TABLE(of, pfuze_dt_ids);
94 96