[PATCH] regulator: tps80031: Trivial cleanups

[PATCH] regulator: tps80031: Trivial cleanups

[Axel Lin]

This patch includes below cleanups:

- Fix typo in comment
- Fix showing wrong register in dev_err
- Remove unnecessary rinfo variable
- Add TPS80032 to MODULE_DESCRIPTION

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

diff --git a/drivers/regulator/tps80031-regulator.c b/drivers/regulator/tps80031-regulator.c
index 127d175..6d5f203 100644
--- a/drivers/regulator/tps80031-regulator.c
+++ b/drivers/regulator/tps80031-regulator.c
@@ -1,7 +1,7 @@
 /*
  * tps80031-regulator.c -- TI TPS80031 regulator driver.
  *
- * Regulator driver for TITPS80031/TPS80032 Fully Integrated Power
+ * Regulator driver for TI TPS80031/TPS80032 Fully Integrated Power
  * Management with Power Path and Battery Charger.
  *
  * Copyright (c) 2012, NVIDIA Corporation.
@@ -311,7 +311,7 @@ static int tps80031_vbus_is_enabled(struct regulator_dev *rdev)
 				TPS80031_CHARGERUSB_CTRL3, &ctrl3);
 	if (ret < 0) {
 		dev_err(ri->dev, "reg 0x%02x read failed, e = %d\n",
-			TPS80031_CHARGERUSB_CTRL1, ret);
+			TPS80031_CHARGERUSB_CTRL3, ret);
 		return ret;
 	}
 	if ((ctrl1 & OPA_MODE_EN) && (ctrl3 & BOOST_HW_PWR_EN))
@@ -679,7 +679,6 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
 {
 	struct tps80031_platform_data *pdata;
 	struct tps80031_regulator_platform_data *tps_pdata;
-	struct tps80031_regulator_info *rinfo;
 	struct tps80031_regulator *ri;
 	struct tps80031_regulator *pmic;
 	struct regulator_dev *rdev;
@@ -703,9 +702,8 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
 
 	for (num = 0; num < TPS80031_REGULATOR_MAX; ++num) {
 		tps_pdata = pdata->regulator_pdata[num];
-		rinfo = &tps80031_rinfo[num];
 		ri = &pmic[num];
-		ri->rinfo = rinfo;
+		ri->rinfo = &tps80031_rinfo[num];
 		ri->dev = &pdev->dev;
 
 		check_smps_mode_mult(pdev->dev.parent, ri);
@@ -788,6 +786,6 @@ static void __exit tps80031_regulator_exit(void)
 module_exit(tps80031_regulator_exit);
 
 MODULE_ALIAS("platform:tps80031-regulator");
-MODULE_DESCRIPTION("Regulator Driver for TI TPS80031 PMIC");
+MODULE_DESCRIPTION("Regulator Driver for TI TPS80031/TPS80032 PMIC");
 MODULE_AUTHOR("Laxman Dewangan <ldewangan@nvidia.com>");
 MODULE_LICENSE("GPL v2");
-- 
1.7.9.5

Re: [PATCH] regulator: tps80031: Trivial cleanups

[Laxman Dewangan]

On Thursday 22 November 2012 02:00 PM, Axel Lin wrote:
> This patch includes below cleanups:
>
> - Fix typo in comment
> - Fix showing wrong register in dev_err
> - Remove unnecessary rinfo variable
> - Add TPS80032 to MODULE_DESCRIPTION
>
> Signed-off-by: Axel Lin<axel.lin@ingics.com>
> ---

Acked-by: Laxman Dewangan <ldewangan@nvidia.com>

Re: [PATCH] regulator: tps80031: Trivial cleanups

[Mark Brown]

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

On Thu, Nov 22, 2012 at 04:30:44PM +0800, Axel Lin wrote:
> This patch includes below cleanups:
> 
> - Fix typo in comment
> - Fix showing wrong register in dev_err
> - Remove unnecessary rinfo variable
> - Add TPS80032 to MODULE_DESCRIPTION

Applied, thanks.

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