linux-next: build failure after merge of the regulator tree

public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

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,
	Hai Li <hali@codeaurora•org>, Rob Clark <robdclark@gmail•com>,
	Dave Airlie <airlied@linux•ie>,
	Bjorn Andersson <bjorn.andersson@sonymobile•com>
Subject: linux-next: build failure after merge of the regulator tree
Date: Thu, 9 Apr 2015 14:33:09 +1000	[thread overview]
Message-ID: <20150409143309.3a1fac67@canb.auug.org.au> (raw)

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

Hi all,

After merging the regulator tree, today's linux-next build (arm multi_v7_defconfig)
failed like this:

drivers/gpu/drm/msm/dsi/dsi_host.c: In function 'dsi_host_regulator_disable':
drivers/gpu/drm/msm/dsi/dsi_host.c:330:4: error: implicit declaration of function 'regulator_set_optimum_mode' [-Werror=implicit-function-declaration]
    regulator_set_optimum_mode(s[i].consumer,
    ^

Caused by commit a689554ba6ed ("drm/msm: Initial add DSI connector
support") from the drm tree interacting with commit ae6e808f1574
("regulator: Drop temporary regulator_set_optimum_mode wrapper") from
the regulator tree.

This happens every time someone renames/changes an API :-(

I have applied the following merge fix patch.  Someone needs to make
sure Linus finds out when the latter of these two trees is merged into
his.

From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Thu, 9 Apr 2015 14:28:42 +1000
Subject: [PATCH] drm/msm: fixes for regulator_set_optimum_mode name change

Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
 drivers/gpu/drm/msm/dsi/dsi_host.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
index fdc54e3eff55..962cf545d24c 100644
--- a/drivers/gpu/drm/msm/dsi/dsi_host.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
@@ -327,8 +327,7 @@ static void dsi_host_regulator_disable(struct msm_dsi_host *msm_host)
 	DBG("");
 	for (i = num - 1; i >= 0; i--)
 		if (regs[i].disable_load >= 0)
-			regulator_set_optimum_mode(s[i].consumer,
-						regs[i].disable_load);
+			regulator_set_load(s[i].consumer, regs[i].disable_load);
 
 	regulator_bulk_disable(num, s);
 }
@@ -343,8 +342,8 @@ static int dsi_host_regulator_enable(struct msm_dsi_host *msm_host)
 	DBG("");
 	for (i = 0; i < num; i++) {
 		if (regs[i].enable_load >= 0) {
-			ret = regulator_set_optimum_mode(s[i].consumer,
-							regs[i].enable_load);
+			ret = regulator_set_load(s[i].consumer,
+						regs[i].enable_load);
 			if (ret < 0) {
 				pr_err("regulator %d set op mode failed, %d\n",
 					i, ret);
@@ -363,7 +362,7 @@ static int dsi_host_regulator_enable(struct msm_dsi_host *msm_host)
 
 fail:
 	for (i--; i >= 0; i--)
-		regulator_set_optimum_mode(s[i].consumer, regs[i].disable_load);
+		regulator_set_load(s[i].consumer, regs[i].disable_load);
 	return ret;
 }
 
-- 
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-04-09  4:33 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-09  4:33 Stephen Rothwell [this message]
2015-04-09  9:35 ` linux-next: build failure after merge of the regulator tree 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
2015-04-09 23:49   ` drm-msm tree (Was: Re: linux-next: build failure after merge of the regulator tree) Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2022-07-07  3:01 linux-next: build failure after merge of the regulator tree 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-03-10  2:44 Stephen Rothwell
2015-03-10 10:40 ` Mark Brown
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

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:fdc54e3eff5 dfblob:962cf545d24 )
 OR (
bs:"drm/msm: fixes for regulator_set_optimum_mode name change" )
	(help)

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=20150409143309.3a1fac67@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=airlied@linux$(echo .)ie \
    --cc=bjorn.andersson@sonymobile$(echo .)com \
    --cc=broonie@kernel$(echo .)org \
    --cc=hali@codeaurora$(echo .)org \
    --cc=lgirdwood@gmail$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=robdclark@gmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

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