From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rob Clark <robdclark@gmail•com>, Mark Brown <broonie@kernel•org>,
Liam Girdwood <lgirdwood@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Srinivas Kandagatla <srinivas.kandagatla@linaro•org>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas•com>,
Dave Airlie <airlied@linux•ie>
Subject: linux-next: build failure after merge of the drm-msm tree
Date: Mon, 11 Jul 2016 13:20:58 +1000 [thread overview]
Message-ID: <20160711132058.6339062f@canb.auug.org.au> (raw)
Hi Rob,
After merging the drm-msm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/msm/hdmi/hdmi.c:523:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.hw_params = msm_hdmi_audio_hw_params,
^
drivers/gpu/drm/msm/hdmi/hdmi.c:523:15: note: (near initialization for 'msm_hdmi_audio_codec_ops.hw_params')
drivers/gpu/drm/msm/hdmi/hdmi.c:524:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.audio_shutdown = msm_hdmi_audio_shutdown,
^
drivers/gpu/drm/msm/hdmi/hdmi.c:524:20: note: (near initialization for 'msm_hdmi_audio_codec_ops.audio_shutdown')
Caused by commit
bf714255fed7 ("drm: msm: Add ASoC generic hdmi audio codec support.")
interacting with commit
efc9194bcff8 ("ASoC: hdmi-codec: callback function will be called with private data")
from the sound-asoc (and drm) trees.
I have added this merge fix patch for today (dave will need something
like this when he merges your tree):
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 11 Jul 2016 13:16:23 +1000
Subject: [PATCH] drm: msm: fix up for "ASoC: hdmi-codec: callback function
will be called with private data"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/gpu/drm/msm/hdmi/hdmi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index aada35547eca..33bf52c6b312 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -438,7 +438,7 @@ static int msm_hdmi_get_gpio(struct device_node *of_node, const char *name)
/*
* HDMI audio codec callbacks
*/
-static int msm_hdmi_audio_hw_params(struct device *dev,
+static int msm_hdmi_audio_hw_params(struct device *dev, void *data,
struct hdmi_codec_daifmt *daifmt,
struct hdmi_codec_params *params)
{
@@ -512,7 +512,7 @@ static int msm_hdmi_audio_hw_params(struct device *dev,
return 0;
}
-static void msm_hdmi_audio_shutdown(struct device *dev)
+static void msm_hdmi_audio_shutdown(struct device *dev, void *data)
{
struct hdmi *hdmi = dev_get_drvdata(dev);
--
2.8.1
--
Cheers,
Stephen Rothwell
next reply other threads:[~2016-07-11 3:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-11 3:20 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-11 0:59 linux-next: build failure after merge of the drm-msm tree Stephen Rothwell
2023-10-10 1:54 Stephen Rothwell
2022-05-05 1:48 Stephen Rothwell
2022-05-05 1:43 Stephen Rothwell
2021-07-29 11:28 Mark Brown
2021-06-18 2:42 Stephen Rothwell
2021-06-18 2:50 ` Stephen Rothwell
2021-06-23 1:02 ` Stephen Rothwell
2018-10-05 1:37 Stephen Rothwell
2018-07-23 4:50 Stephen Rothwell
2018-07-25 12:08 ` Rob Clark
2018-06-04 3:20 Stephen Rothwell
2015-12-15 1:27 Stephen Rothwell
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=20160711132058.6339062f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=broonie@kernel$(echo .)org \
--cc=kuninori.morimoto.gx@renesas$(echo .)com \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robdclark@gmail$(echo .)com \
--cc=srinivas.kandagatla@linaro$(echo .)org \
/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