regulator: twl-regulator: Simplify the code matching regulator id

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>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index 9cf6f59d27bce92bd17973abeabe21cf6b48274e..88bc32bc31a0ac780c6c39537415e0d27a8f7b82 100644 (file)
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -1189,10 +1189,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;