From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Bjorn Andersson <bjorn.andersson@sonymobile.com>,
Hai Li <hali@codeaurora.org>, Rob Clark <robdclark@gmail.com>,
Yaniv Gardi <ygardi@codeaurora.org>,
Christoph Hellwig <hch@lst.de>
Subject: linux-next: build failure after merge of the regulator tree
Date: Tue, 10 Mar 2015 13:44:41 +1100 [thread overview]
Message-ID: <20150310134441.1aa4bb60@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 3343 bytes --]
Hi all,
After merging the regulator tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/msm/edp/edp_ctrl.c: In function 'edp_regulator_enable':
drivers/gpu/drm/msm/edp/edp_ctrl.c:335:2: error: implicit declaration of function 'regulator_set_optimum_mode' [-Werror=implicit-function-declaration]
ret = regulator_set_optimum_mode(ctrl->vdda_vreg, VDDA_UA_ON_LOAD);
^
Caused by commits e39ce48f5362 ("regulator: Rename
regulator_set_optimum_mode") and ae6e808f1574 ("regulator: Drop
temporary regulator_set_optimum_mode wrapper") interacting with commit
ab5b0107ccf3 ("drm/msm: Initial add eDP support in msm drm driver
(v5)") from Linus' tree (in v4.0-rc1) tree.
There was another use of regulator_set_optimum_mode() in
drivers/phy/phy-qcom-ufs.c (introduced by commit adaafaa393ef ("phy:
qcom-ufs: add support for QUALCOMM Technologies UFS PHY drivers") also
from v4.0-rc1) which I also fixed in the patch below.
grep is your friend ...
This patch should be applied to your tree as it is based off v4.0-rc1
already.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 10 Mar 2015 13:35:59 +1100
Subject: [PATCH] fixes for regulator_set_optimum_mode name change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/msm/edp/edp_ctrl.c | 6 +++---
drivers/phy/phy-qcom-ufs.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c
index 3e246210c46f..0ec5abdba5c4 100644
--- a/drivers/gpu/drm/msm/edp/edp_ctrl.c
+++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c
@@ -332,7 +332,7 @@ static int edp_regulator_enable(struct edp_ctrl *ctrl)
goto vdda_set_fail;
}
- ret = regulator_set_optimum_mode(ctrl->vdda_vreg, VDDA_UA_ON_LOAD);
+ ret = regulator_set_load(ctrl->vdda_vreg, VDDA_UA_ON_LOAD);
if (ret < 0) {
pr_err("%s: vdda_vreg set regulator mode failed.\n", __func__);
goto vdda_set_fail;
@@ -356,7 +356,7 @@ static int edp_regulator_enable(struct edp_ctrl *ctrl)
lvl_enable_fail:
regulator_disable(ctrl->vdda_vreg);
vdda_enable_fail:
- regulator_set_optimum_mode(ctrl->vdda_vreg, VDDA_UA_OFF_LOAD);
+ regulator_set_load(ctrl->vdda_vreg, VDDA_UA_OFF_LOAD);
vdda_set_fail:
return ret;
}
@@ -365,7 +365,7 @@ static void edp_regulator_disable(struct edp_ctrl *ctrl)
{
regulator_disable(ctrl->lvl_vreg);
regulator_disable(ctrl->vdda_vreg);
- regulator_set_optimum_mode(ctrl->vdda_vreg, VDDA_UA_OFF_LOAD);
+ regulator_set_load(ctrl->vdda_vreg, VDDA_UA_OFF_LOAD);
}
static int edp_gpio_config(struct edp_ctrl *ctrl)
diff --git a/drivers/phy/phy-qcom-ufs.c b/drivers/phy/phy-qcom-ufs.c
index 44ee983d57fe..86665e9dc399 100644
--- a/drivers/phy/phy-qcom-ufs.c
+++ b/drivers/phy/phy-qcom-ufs.c
@@ -346,10 +346,10 @@ int ufs_qcom_phy_cfg_vreg(struct phy *phy,
goto out;
}
uA_load = on ? vreg->max_uA : 0;
- ret = regulator_set_optimum_mode(reg, uA_load);
+ ret = regulator_set_load(reg, uA_load);
if (ret >= 0) {
/*
- * regulator_set_optimum_mode() returns new regulator
+ * regulator_set_load() returns new regulator
* mode upon success.
*/
ret = 0;
--
2.1.4
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-03-10 2:44 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-10 2:44 Stephen Rothwell [this message]
2015-03-10 10:40 ` linux-next: build failure after merge of the regulator tree Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2022-07-07 3:01 Stephen Rothwell
2021-11-23 7:41 Stephen Rothwell
2021-11-23 8:33 ` Vaittinen, Matti
2021-11-23 9:26 ` Vaittinen, Matti
2021-11-23 14:17 ` Mark Brown
2021-10-22 1:53 Stephen Rothwell
2021-10-22 10:31 ` Alistair
2021-10-22 12:40 ` Mark Brown
2020-02-25 23:39 Stephen Rothwell
2019-09-03 4:26 Stephen Rothwell
2019-09-03 6:46 ` Bartosz Golaszewski
2019-08-29 3:57 Stephen Rothwell
2018-11-20 0:49 Stephen Rothwell
2018-11-20 0:56 ` Dmitry Osipenko
2017-02-01 2:42 Stephen Rothwell
2017-02-01 10:03 ` Mark Brown
2017-02-02 22:30 ` Stephen Rothwell
2017-02-03 11:31 ` Mark Brown
2015-04-09 4:33 Stephen Rothwell
2015-04-09 9:35 ` Mark Brown
2015-04-13 23:44 ` Stephen Rothwell
2015-04-14 1:07 ` Bjorn Andersson
2015-04-14 1:22 ` Stephen Rothwell
2015-04-14 9:40 ` Mark Brown
2015-04-15 3:03 ` Dave Airlie
2015-04-09 15:00 ` Rob Clark
2014-09-08 8:33 Stephen Rothwell
2014-09-09 22:39 ` Mark Brown
2014-09-10 2:33 ` Chris Zhong
2014-09-10 10:54 ` Mark Brown
2014-09-10 2:50 ` Doug Anderson
2014-08-17 20:41 Stephen Rothwell
2014-07-08 3:10 Stephen Rothwell
2014-05-27 4:41 Stephen Rothwell
2014-01-06 6:37 Stephen Rothwell
2013-07-01 4:18 Stephen Rothwell
2013-07-01 6:07 ` Kishon Vijay Abraham I
2013-07-01 8:43 ` Mark Brown
2013-07-01 8:47 ` Kishon Vijay Abraham I
2013-07-01 8:42 ` Mark Brown
2012-09-10 3:20 Stephen Rothwell
2012-06-21 3:27 Stephen Rothwell
2012-06-21 8:13 ` Kim, Milo
2012-06-21 8:20 ` Axel Lin
2012-06-21 8:42 ` Kim, Milo
2012-06-21 9:14 ` Mark Brown
2012-06-21 11:04 ` Stephen Rothwell
2012-06-21 11:30 ` Mark Brown
2012-06-21 17:35 ` Andrew Morton
2012-06-21 9:46 ` Mark Brown
2012-06-20 4:50 Stephen Rothwell
2012-06-20 4:55 ` Axel Lin
2012-06-20 15:33 ` Stephen Warren
2012-04-10 3:01 Stephen Rothwell
2011-11-24 3:10 Stephen Rothwell
2011-11-24 7:31 ` Rajendra Nayak
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=20150310134441.1aa4bb60@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bjorn.andersson@sonymobile.com \
--cc=broonie@kernel.org \
--cc=hali@codeaurora.org \
--cc=hch@lst.de \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robdclark@gmail.com \
--cc=ygardi@codeaurora.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).