lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date:	Sun, 15 Jul 2012 16:57:12 +0800
From:	Axel Lin <axel.lin@...il.com>
To:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc:	"Milo(Woogyom) Kim" <milo.kim@...com>, Liam Girdwood <lrg@...com>,
	linux-kernel@...r.kernel.org
Subject: [PATCH] regulator: lp872x: Simplify implementation of
 lp872x_find_regulator_init_data()

Pass regulator id rahter than the index to lp872x_find_regulator_init_data(),
then the code can be simpler.
We can also get max_regulators by lp->num_regulators.

Signed-off-by: Axel Lin <axel.lin@...il.com>
---
 drivers/regulator/lp872x.c |   28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/drivers/regulator/lp872x.c b/drivers/regulator/lp872x.c
index 471f8e8..212c38e 100644
--- a/drivers/regulator/lp872x.c
+++ b/drivers/regulator/lp872x.c
@@ -796,30 +796,16 @@ static int lp872x_config(struct lp872x *lp)
 }
 
 static struct regulator_init_data
-*lp872x_find_regulator_init_data(int idx, struct lp872x *lp)
+*lp872x_find_regulator_init_data(int id, struct lp872x *lp)
 {
-	int i, base, id, max_regulators;
-
-	switch (lp->chipid) {
-	case LP8720:
-		base = LP8720_ID_BASE;
-		max_regulators = LP8720_NUM_REGULATORS;
-		break;
-	case LP8725:
-		base = LP8725_ID_BASE;
-		max_regulators = LP8725_NUM_REGULATORS;
-		break;
-	default:
-		return NULL;
-	}
+	int i;
 
-	id = base + idx;
-	for (i = 0 ; i < max_regulators ; i++)
+	for (i = 0; i < lp->num_regulators; i++) {
 		if (lp->pdata->regulator_data[i].id == id)
-			break;
+			return lp->pdata->regulator_data[i].init_data;
+	}
 
-	return (i == max_regulators) ? NULL :
-			lp->pdata->regulator_data[i].init_data;
+	return NULL;
 }
 
 static int lp872x_regulator_register(struct lp872x *lp)
@@ -834,7 +820,7 @@ static int lp872x_regulator_register(struct lp872x *lp)
 						&lp8725_regulator_desc[i];
 
 		cfg.dev = lp->dev;
-		cfg.init_data = lp872x_find_regulator_init_data(i, lp);
+		cfg.init_data = lp872x_find_regulator_init_data(desc->id, lp);
 		cfg.driver_data = lp;
 		cfg.regmap = lp->regmap;
 
-- 
1.7.9.5



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ