From: Maciej Purski <m.purski@samsung.com> To: Mark Brown <broonie@kernel.org>, Tony Lindgren <tony@atomide.com> Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, Carlos Hernandez <ceh@ti.com>, Marek Szyprowski <m.szyprowski@samsung.com>, Maciej Purski <m.purski@samsung.com> Subject: [PATCH 2/7] regulator: core: Add regulator_set_voltage_rdev() Date: Mon, 04 Jun 2018 15:59:19 +0200 [thread overview] Message-ID: <1528120764-14316-3-git-send-email-m.purski@samsung.com> (raw) In-Reply-To: <1528120764-14316-1-git-send-email-m.purski@samsung.com> Refactor regulator_set_voltage_unlocked() by taking code related to regulator_dev and creating a new function regulator_set_voltage_rdev(), which operates only on struct regulator_dev. Signed-off-by: Maciej Purski <m.purski@samsung.com> --- drivers/regulator/core.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index b740426..413a824 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -105,6 +105,9 @@ static int _notifier_call_chain(struct regulator_dev *rdev, unsigned long event, void *data); static int _regulator_do_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV); +static int regulator_set_voltage_rdev(struct regulator_dev *rdev, + int min_uV, int max_uV, + suspend_state_t state); static struct regulator *create_regulator(struct regulator_dev *rdev, struct device *dev, const char *supply_name); @@ -2996,8 +2999,6 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, int ret = 0; int old_min_uV, old_max_uV; int current_uV; - int best_supply_uV = 0; - int supply_change_uV = 0; pr_err("%s: %d\n", __func__, __LINE__); /* If we're setting the same range as last time the change @@ -3042,6 +3043,26 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, if (ret < 0) goto out2; + ret = regulator_set_voltage_rdev(rdev, min_uV, max_uV, state); + if (ret < 0) + goto out2; + +out: + return 0; +out2: + voltage->min_uV = old_min_uV; + voltage->max_uV = old_max_uV; + + return ret; +} + +static int regulator_set_voltage_rdev(struct regulator_dev *rdev, int min_uV, + int max_uV, suspend_state_t state) +{ + int best_supply_uV = 0; + int supply_change_uV = 0; + int ret; + if (rdev->supply && regulator_ops_is_valid(rdev->supply->rdev, REGULATOR_CHANGE_VOLTAGE) && @@ -3053,13 +3074,13 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, selector = regulator_map_voltage(rdev, min_uV, max_uV); if (selector < 0) { ret = selector; - goto out2; + goto out; } best_supply_uV = _regulator_list_voltage(rdev, selector, 0); if (best_supply_uV < 0) { ret = best_supply_uV; - goto out2; + goto out; } best_supply_uV += rdev->desc->min_dropout_uV; @@ -3067,7 +3088,7 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, current_supply_uV = _regulator_get_voltage(rdev->supply->rdev); if (current_supply_uV < 0) { ret = current_supply_uV; - goto out2; + goto out; } supply_change_uV = best_supply_uV - current_supply_uV; @@ -3079,7 +3100,7 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, if (ret) { dev_err(&rdev->dev, "Failed to increase supply voltage: %d\n", ret); - goto out2; + goto out; } } @@ -3089,7 +3110,7 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, ret = _regulator_do_set_suspend_voltage(rdev, min_uV, max_uV, state); if (ret < 0) - goto out2; + goto out; if (supply_change_uV < 0) { ret = regulator_set_voltage_unlocked(rdev->supply, @@ -3103,11 +3124,6 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, out: return ret; -out2: - voltage->min_uV = old_min_uV; - voltage->max_uV = old_max_uV; - - return ret; } /** -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: m.purski@samsung.com (Maciej Purski) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/7] regulator: core: Add regulator_set_voltage_rdev() Date: Mon, 04 Jun 2018 15:59:19 +0200 [thread overview] Message-ID: <1528120764-14316-3-git-send-email-m.purski@samsung.com> (raw) In-Reply-To: <1528120764-14316-1-git-send-email-m.purski@samsung.com> Refactor regulator_set_voltage_unlocked() by taking code related to regulator_dev and creating a new function regulator_set_voltage_rdev(), which operates only on struct regulator_dev. Signed-off-by: Maciej Purski <m.purski@samsung.com> --- drivers/regulator/core.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index b740426..413a824 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -105,6 +105,9 @@ static int _notifier_call_chain(struct regulator_dev *rdev, unsigned long event, void *data); static int _regulator_do_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV); +static int regulator_set_voltage_rdev(struct regulator_dev *rdev, + int min_uV, int max_uV, + suspend_state_t state); static struct regulator *create_regulator(struct regulator_dev *rdev, struct device *dev, const char *supply_name); @@ -2996,8 +2999,6 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, int ret = 0; int old_min_uV, old_max_uV; int current_uV; - int best_supply_uV = 0; - int supply_change_uV = 0; pr_err("%s: %d\n", __func__, __LINE__); /* If we're setting the same range as last time the change @@ -3042,6 +3043,26 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, if (ret < 0) goto out2; + ret = regulator_set_voltage_rdev(rdev, min_uV, max_uV, state); + if (ret < 0) + goto out2; + +out: + return 0; +out2: + voltage->min_uV = old_min_uV; + voltage->max_uV = old_max_uV; + + return ret; +} + +static int regulator_set_voltage_rdev(struct regulator_dev *rdev, int min_uV, + int max_uV, suspend_state_t state) +{ + int best_supply_uV = 0; + int supply_change_uV = 0; + int ret; + if (rdev->supply && regulator_ops_is_valid(rdev->supply->rdev, REGULATOR_CHANGE_VOLTAGE) && @@ -3053,13 +3074,13 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, selector = regulator_map_voltage(rdev, min_uV, max_uV); if (selector < 0) { ret = selector; - goto out2; + goto out; } best_supply_uV = _regulator_list_voltage(rdev, selector, 0); if (best_supply_uV < 0) { ret = best_supply_uV; - goto out2; + goto out; } best_supply_uV += rdev->desc->min_dropout_uV; @@ -3067,7 +3088,7 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, current_supply_uV = _regulator_get_voltage(rdev->supply->rdev); if (current_supply_uV < 0) { ret = current_supply_uV; - goto out2; + goto out; } supply_change_uV = best_supply_uV - current_supply_uV; @@ -3079,7 +3100,7 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, if (ret) { dev_err(&rdev->dev, "Failed to increase supply voltage: %d\n", ret); - goto out2; + goto out; } } @@ -3089,7 +3110,7 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, ret = _regulator_do_set_suspend_voltage(rdev, min_uV, max_uV, state); if (ret < 0) - goto out2; + goto out; if (supply_change_uV < 0) { ret = regulator_set_voltage_unlocked(rdev->supply, @@ -3103,11 +3124,6 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, out: return ret; -out2: - voltage->min_uV = old_min_uV; - voltage->max_uV = old_max_uV; - - return ret; } /** -- 2.7.4
next prev parent reply other threads:[~2018-06-04 14:00 UTC|newest] Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-29 22:15 Regression in Linux next again Tony Lindgren 2018-05-29 22:15 ` Tony Lindgren 2018-05-30 9:13 ` Mark Brown 2018-05-30 9:13 ` Mark Brown 2018-05-30 14:03 ` Maciej Purski 2018-05-30 14:03 ` Maciej Purski 2018-05-30 14:33 ` Mark Brown 2018-05-30 14:33 ` Mark Brown 2018-05-30 14:45 ` Tony Lindgren 2018-05-30 14:45 ` Tony Lindgren [not found] ` <CGME20180604135952eucas1p292f7bcec405e6a1a6261031df36cad32@eucas1p2.samsung.com> 2018-06-04 13:59 ` Maciej Purski 2018-06-04 13:59 ` Maciej Purski [not found] ` <CGME20180604135952eucas1p2d76b6aa5d8fc9912113d519b48f7e99a@eucas1p2.samsung.com> 2018-06-04 13:59 ` [PATCH 1/7] regulator: core: Add debug messages Maciej Purski 2018-06-04 13:59 ` Maciej Purski [not found] ` <CGME20180604135952eucas1p2e3fdb68bf31e32b7c9557051671885a9@eucas1p2.samsung.com> 2018-06-04 13:59 ` Maciej Purski [this message] 2018-06-04 13:59 ` [PATCH 2/7] regulator: core: Add regulator_set_voltage_rdev() Maciej Purski [not found] ` <CGME20180604135953eucas1p2f2c9dd9581cd114d323c3d64afe5c308@eucas1p2.samsung.com> 2018-06-04 13:59 ` [PATCH 3/7] regulator: core: Use re-entrant locks Maciej Purski 2018-06-04 13:59 ` Maciej Purski [not found] ` <CGME20180604135953eucas1p2ec281df0793bc73e79f3000837abcb04@eucas1p2.samsung.com> 2018-06-04 13:59 ` [PATCH 4/7] regulator: core: Implement voltage balancing algorithm Maciej Purski 2018-06-04 13:59 ` Maciej Purski 2018-06-04 13:59 ` Maciej Purski [not found] ` <CGME20180604135954eucas1p2156fed3300b5514a4efa2baf9e7b9bc5@eucas1p2.samsung.com> 2018-06-04 13:59 ` [PATCH 5/7] regulator: core: Lock dependent regulators Maciej Purski 2018-06-04 13:59 ` Maciej Purski 2018-06-04 13:59 ` Maciej Purski 2018-06-04 14:20 ` Lucas Stach 2018-06-04 14:20 ` Lucas Stach 2018-06-18 12:37 ` Maciej Purski 2018-06-18 12:37 ` Maciej Purski [not found] ` <CGME20180604135954eucas1p2eeb77ada3ca97fecc6caec20d7e8397a@eucas1p2.samsung.com> 2018-06-04 13:59 ` [PATCH 6/7] regulator: core: Lock dependent regulators on regulator_enable() Maciej Purski 2018-06-04 13:59 ` Maciej Purski [not found] ` <CGME20180604135954eucas1p2bebd1c4970401bb957da228056f9a662@eucas1p2.samsung.com> 2018-06-04 13:59 ` [PATCH 7/7] regulator: core: Enable voltage balancing Maciej Purski 2018-06-04 13:59 ` Maciej Purski 2018-06-04 23:13 ` kbuild test robot 2018-06-04 23:13 ` kbuild test robot 2018-06-04 23:13 ` kbuild test robot 2018-06-04 23:54 ` kbuild test robot 2018-06-04 23:54 ` kbuild test robot 2018-06-04 23:54 ` kbuild test robot 2018-06-05 4:45 ` Regression in Linux next again Tony Lindgren 2018-06-05 4:45 ` Tony Lindgren [not found] ` <CGME20180613103622eucas1p1778ba2c2e5dd85ccb4c488bd0a38386d@eucas1p1.samsung.com> 2018-06-13 10:33 ` [PATCH v2] regulator: core: Enable voltage balancing Maciej Purski 2018-06-13 10:33 ` Maciej Purski 2018-06-15 11:29 ` Tony Lindgren 2018-06-15 11:29 ` Tony Lindgren 2018-06-18 13:17 ` Maciej Purski 2018-06-18 13:17 ` Maciej Purski [not found] ` <CGME20180618140856eucas1p281619f9bf003655a3c2eac356216ab25@eucas1p2.samsung.com> 2018-06-18 14:08 ` [PATCH] regulator: core: Pass max_uV value to regulator_set_voltage_rdev Maciej Purski 2018-06-18 14:08 ` Maciej Purski 2018-07-02 8:05 ` Tony Lindgren 2018-07-02 8:05 ` Tony Lindgren 2018-09-28 20:09 ` Dmitry Osipenko 2018-09-28 20:09 ` Dmitry Osipenko 2018-09-28 20:09 ` Dmitry Osipenko 2018-09-28 20:09 ` Dmitry Osipenko 2018-09-28 20:22 ` Tony Lindgren 2018-09-28 20:22 ` Tony Lindgren 2018-09-28 20:36 ` Dmitry Osipenko 2018-09-28 20:36 ` Dmitry Osipenko 2018-09-28 22:26 ` Dmitry Osipenko 2018-09-28 22:26 ` Dmitry Osipenko 2018-09-28 22:26 ` Dmitry Osipenko 2018-09-28 22:41 ` Tony Lindgren 2018-09-28 22:41 ` Tony Lindgren 2018-09-28 23:17 ` Dmitry Osipenko 2018-09-28 23:17 ` Dmitry Osipenko 2018-09-28 23:17 ` Dmitry Osipenko 2018-09-28 23:51 ` Dmitry Osipenko 2018-09-28 23:51 ` Dmitry Osipenko 2018-09-28 23:51 ` Dmitry Osipenko 2018-09-29 0:27 ` Tony Lindgren 2018-09-29 0:27 ` Tony Lindgren 2018-09-29 0:44 ` Dmitry Osipenko 2018-09-29 0:44 ` Dmitry Osipenko 2018-10-01 7:25 ` Maciej Purski 2018-10-01 7:25 ` Maciej Purski 2018-10-01 13:34 ` Dmitry Osipenko 2018-10-01 13:34 ` Dmitry Osipenko 2018-05-30 14:53 ` Regression in Linux next again Naresh Kamboju 2018-05-30 14:53 ` Naresh Kamboju 2018-05-31 5:44 ` Naresh Kamboju 2018-05-31 5:44 ` Naresh Kamboju
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1528120764-14316-3-git-send-email-m.purski@samsung.com \ --to=m.purski@samsung.com \ --cc=broonie@kernel.org \ --cc=ceh@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=m.szyprowski@samsung.com \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.