2012년 12월 25일 11:06, Axel Lin 쓴 글:
This patch also includes below cleanups:
Show correct regulator id in dev_err.
Remove __devexit_p.

Signed-off-by: Axel Lin<axel....@ingics.com>
---
  drivers/regulator/lp8755.c |    9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/regulator/lp8755.c b/drivers/regulator/lp8755.c
index dbc4d12..06a82e2 100644
--- a/drivers/regulator/lp8755.c
+++ b/drivers/regulator/lp8755.c
@@ -358,7 +358,9 @@ static int lp8755_regulator_init(struct lp8755_chip *pchip)
                    regulator_register(&lp8755_regulators[buck_num], &rconfig);
                if (IS_ERR(pchip->rdev[buck_num])) {
                        ret = PTR_ERR(pchip->rdev[buck_num]);
-                       dev_err(pchip->dev, "regulator init failed: buck 0\n");
+                       pchip->rdev[buck_num] = NULL;
+                       dev_err(pchip->dev, "regulator init failed: buck %d\n",
+                               buck_num);
                        goto err_buck;
                }
        }
@@ -367,8 +369,7 @@ static int lp8755_regulator_init(struct lp8755_chip *pchip)
err_buck:
        for (icnt = 0; icnt < LP8755_BUCK_MAX; icnt++)
-               if (pchip->rdev[icnt] != NULL)
-                       regulator_unregister(pchip->rdev[icnt]);
+               regulator_unregister(pchip->rdev[icnt]);
        return ret;
  }
@@ -557,7 +558,7 @@ static struct i2c_driver lp8755_i2c_driver = {
                   .name = LP8755_NAME,
                   },
        .probe = lp8755_probe,
-       .remove = __devexit_p(lp8755_remove),
+       .remove = lp8755_remove,
        .id_table = lp8755_id,
  };
-- 1.7.9.5
Thank you Alex.
I will check your patch and test it using my board.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to