Re: [PATCH 5/6] regulator: pfuze100: use devm_regulator_register()

[Mark Brown]

On Fri, Dec 06, 2013 at 04:11:58PM +0900, Jingoo Han wrote:
> Use devm_regulator_register() to make cleanup paths simpler,
> and remove unnecessary remove().

Applied, thanks.


signature.asc
Description: Digital signature

RE: [PATCH 5/6] regulator: pfuze100: use devm_regulator_register()

[yibin.g...@freescale.com]

Acked-by: Robin Gong 

-Original Message-
From: Jingoo Han [mailto:jg1@samsung.com] 
Sent: Friday, December 06, 2013 3:12 PM
To: 'Mark Brown'
Cc: 'Liam Girdwood'; linux-kernel@vger.kernel.org; 'Jingoo Han'; Gong 
Yibin-B38343; 'Axel Lin'; 'Tim Harvey'
Subject: [PATCH 5/6] regulator: pfuze100: use devm_regulator_register()

Use devm_regulator_register() to make cleanup paths simpler, and remove 
unnecessary remove().

Signed-off-by: Jingoo Han 
---
 drivers/regulator/pfuze100-regulator.c |   20 +++-
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/drivers/regulator/pfuze100-regulator.c 
b/drivers/regulator/pfuze100-regulator.c
index 032df37..50c1bf8 100644
--- a/drivers/regulator/pfuze100-regulator.c
+++ b/drivers/regulator/pfuze100-regulator.c
@@ -408,31 +408,18 @@ static int pfuze100_regulator_probe(struct i2c_client 
*client,
config.driver_data = pfuze_chip;
config.of_node = match_of_node(i);
 
-   pfuze_chip->regulators[i] = regulator_register(desc, &config);
+   pfuze_chip->regulators[i] =
+   devm_regulator_register(&client->dev, desc, &config);
if (IS_ERR(pfuze_chip->regulators[i])) {
dev_err(&client->dev, "register regulator%s failed\n",
pfuze100_regulators[i].desc.name);
-   ret = PTR_ERR(pfuze_chip->regulators[i]);
-   while (--i >= 0)
-   regulator_unregister(pfuze_chip->regulators[i]);
-   return ret;
+   return PTR_ERR(pfuze_chip->regulators[i]);
}
}
 
return 0;
 }
 
-static int pfuze100_regulator_remove(struct i2c_client *client) -{
-   int i;
-   struct pfuze_chip *pfuze_chip = i2c_get_clientdata(client);
-
-   for (i = 0; i < PFUZE100_MAX_REGULATOR; i++)
-   regulator_unregister(pfuze_chip->regulators[i]);
-
-   return 0;
-}
-
 static struct i2c_driver pfuze_driver = {
.id_table = pfuze_device_id,
.driver = {
@@ -441,7 +428,6 @@ static struct i2c_driver pfuze_driver = {
.of_match_table = pfuze_dt_ids,
},
.probe = pfuze100_regulator_probe,
-   .remove = pfuze100_regulator_remove,
 };
 module_i2c_driver(pfuze_driver);
 
--
1.7.10.4



--
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/

[PATCH 5/6] regulator: pfuze100: use devm_regulator_register()

[Jingoo Han]

Use devm_regulator_register() to make cleanup paths simpler,
and remove unnecessary remove().

Signed-off-by: Jingoo Han 
---
 drivers/regulator/pfuze100-regulator.c |   20 +++-
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/drivers/regulator/pfuze100-regulator.c 
b/drivers/regulator/pfuze100-regulator.c
index 032df37..50c1bf8 100644
--- a/drivers/regulator/pfuze100-regulator.c
+++ b/drivers/regulator/pfuze100-regulator.c
@@ -408,31 +408,18 @@ static int pfuze100_regulator_probe(struct i2c_client 
*client,
config.driver_data = pfuze_chip;
config.of_node = match_of_node(i);
 
-   pfuze_chip->regulators[i] = regulator_register(desc, &config);
+   pfuze_chip->regulators[i] =
+   devm_regulator_register(&client->dev, desc, &config);
if (IS_ERR(pfuze_chip->regulators[i])) {
dev_err(&client->dev, "register regulator%s failed\n",
pfuze100_regulators[i].desc.name);
-   ret = PTR_ERR(pfuze_chip->regulators[i]);
-   while (--i >= 0)
-   regulator_unregister(pfuze_chip->regulators[i]);
-   return ret;
+   return PTR_ERR(pfuze_chip->regulators[i]);
}
}
 
return 0;
 }
 
-static int pfuze100_regulator_remove(struct i2c_client *client)
-{
-   int i;
-   struct pfuze_chip *pfuze_chip = i2c_get_clientdata(client);
-
-   for (i = 0; i < PFUZE100_MAX_REGULATOR; i++)
-   regulator_unregister(pfuze_chip->regulators[i]);
-
-   return 0;
-}
-
 static struct i2c_driver pfuze_driver = {
.id_table = pfuze_device_id,
.driver = {
@@ -441,7 +428,6 @@ static struct i2c_driver pfuze_driver = {
.of_match_table = pfuze_dt_ids,
},
.probe = pfuze100_regulator_probe,
-   .remove = pfuze100_regulator_remove,
 };
 module_i2c_driver(pfuze_driver);
 
-- 
1.7.10.4


--
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/