[PATCH] regulator: twl-regulator: Simplify the code matching regulator id

[PATCH] regulator: twl-regulator: Simplify the code matching regulator id

[Axel Lin]

This patch makes the code easier to read.

Also add checking the case when no desc id is matched. This is required because
if no desc id is matched, the poiner info is pointed to twl_of_match[i].data
which may be not NULL. Checking info is NULL or not latter does not catch the
error.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 drivers/regulator/twl-regulator.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index 9cdfc38..964946f 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -1207,10 +1207,12 @@ static int __devinit twlreg_probe(struct platform_device *pdev)
 		initdata = pdev->dev.platform_data;
 		for (i = 0, info = NULL; i < ARRAY_SIZE(twl_of_match); i++) {
 			info = twl_of_match[i].data;
-			if (!info || info->desc.id != id)
-				continue;
-			break;
+			if (info && info->desc.id == id)
+				break;
 		}
+		if (i == ARRAY_SIZE(twl_of_match))
+			return -ENODEV;
+
 		drvdata = initdata->driver_data;
 		if (!drvdata)
 			return -EINVAL;
-- 
1.7.5.4

Re: [PATCH] regulator: twl-regulator: Simplify the code matching regulator id

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 382 bytes --]

On Mon, Apr 09, 2012 at 10:32:49PM +0800, Axel Lin wrote:
> This patch makes the code easier to read.
> 
> Also add checking the case when no desc id is matched. This is required because
> if no desc id is matched, the poiner info is pointed to twl_of_match[i].data
> which may be not NULL. Checking info is NULL or not latter does not catch the
> error.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]