Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1664939

[PATCH v2 1/2] regulator: tps65910: check TPS65910_NUM_REGS at build time

From Michał Mirosław <mirq-linux@rere.qmqm.pl>
Newsgroups linux.kernel
Subject [PATCH v2 1/2] regulator: tps65910: check TPS65910_NUM_REGS at build time
Date 2017-06-13 16:50 +0200
Message-ID <tRViO-Jw-15@gated-at.bofh.it> (permalink)
References <tRUwp-dH-13@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

Check TPS65910_NUM_REGS at build time instead of silently registering
not all regulators at runtime.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
v2:
  - added commit message

 drivers/regulator/tps65910-regulator.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index 696116ebdf50a..81672a58fcc23 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -1107,6 +1107,7 @@ static int tps65910_probe(struct platform_device *pdev)
 
 	switch (tps65910_chip_id(tps65910)) {
 	case TPS65910:
+		BUILD_BUG_ON(TPS65910_NUM_REGS < ARRAY_SIZE(tps65910_regs));
 		pmic->get_ctrl_reg = &tps65910_get_ctrl_register;
 		pmic->num_regulators = ARRAY_SIZE(tps65910_regs);
 		pmic->ext_sleep_control = tps65910_ext_sleep_control;
@@ -1119,6 +1120,7 @@ static int tps65910_probe(struct platform_device *pdev)
 					DCDCCTRL_DCDCCKSYNC_MASK);
 		break;
 	case TPS65911:
+		BUILD_BUG_ON(TPS65910_NUM_REGS < ARRAY_SIZE(tps65911_regs));
 		pmic->get_ctrl_reg = &tps65911_get_ctrl_register;
 		pmic->num_regulators = ARRAY_SIZE(tps65911_regs);
 		pmic->ext_sleep_control = tps65911_ext_sleep_control;
@@ -1144,8 +1146,7 @@ static int tps65910_probe(struct platform_device *pdev)
 	if (!pmic->rdev)
 		return -ENOMEM;
 
-	for (i = 0; i < pmic->num_regulators && i < TPS65910_NUM_REGS;
-			i++, info++) {
+	for (i = 0; i < pmic->num_regulators; i++, info++) {
 		/* Register the regulators */
 		pmic->info[i] = info;
 
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/2] regulator: tps65910: check TPS65910_NUM_REGS at build  time Michał Mirosław <mirq-linux@rere.qmqm.pl> - 2017-06-13 16:00 +0200
  Re: [PATCH 1/2] regulator: tps65910: check TPS65910_NUM_REGS at build  time Keerthy <j-keerthy@ti.com> - 2017-06-13 16:10 +0200
    Re: [PATCH 1/2] regulator: tps65910: check TPS65910_NUM_REGS at  build time Michał Mirosław <mirq-linux@rere.qmqm.pl> - 2017-06-13 16:40 +0200
  [PATCH v2 1/2] regulator: tps65910: check TPS65910_NUM_REGS at build  time Michał Mirosław <mirq-linux@rere.qmqm.pl> - 2017-06-13 16:50 +0200
    Re: [PATCH v2 1/2] regulator: tps65910: check TPS65910_NUM_REGS at  build time Mark Brown <broonie@kernel.org> - 2017-06-13 19:50 +0200

csiph-web