From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753014AbcF2Otc (ORCPT ); Wed, 29 Jun 2016 10:49:32 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:62128 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752689AbcF2Otb (ORCPT ); Wed, 29 Jun 2016 10:49:31 -0400 From: Arnd Bergmann To: David Airlie , Mark Brown Cc: Matthias Brugger , Jie Qiu , Philipp Zabel , Junzhi Zhao , Kuninori Morimoto , alsa-devel@alsa-project.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Stephen Rothwell , Arnd Bergmann Subject: [PATCH] drm: mediatek: fix prototypes after API change Date: Wed, 29 Jun 2016 16:51:29 +0200 Message-Id: <20160629145129.315931-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:afeNnUmHtwg798qRVogQR96M34t1jEQTEcmKamm2KwrvtxtsPdl vy07ki4P8/3fB1fdv+zHLWXdwd8fhhAIZe9ZhojuKc9UbwtFjKagIAydsbsoYQduz+NEi3t UP3d64K00Fdf2kAZA3Ip63pFajJSWYNs180G5AQ4G5kruvmCtcGwMCcQlp5herGkk2FvHvr x/l8BPvSE1Vwbo+WDJQNA== X-UI-Out-Filterresults: notjunk:1;V01:K0:L3Q1gBBgh+k=:izZXcGeBTn4Yy4hnOoMydw KyQbYXJ+9Q2fT/ZIzZ0V+/DH3aEV+61ySpMnmC9edfirFGoSq691Sz6ZHs4CNMIvqKEGicX6k oILtw2hkhrSgi/GVgOzyKblvngEv2400W4mlGZF0hcqFXV4N6l+UXPUdToAL9WLA40e3sN++B 9qa+2H2fxNrCWd4RYXcEtHWFgm2X7iG5Jrb+NLIpqGEM4fUQaajRsg3RjLQTuuJVYRCoIAyBW 0gu92brwv3ksOZeEzH7Ruo09GPd/GTh566W55fq09wyDflZJNFxhiwRiy6hq+2HmEt5ycRS0I 3g/+oD4NrLjN2oIqeCP/PahvzGttEsBXrjhGAANtHvWL+imBW5gBerMqzntZtvDQZrHheezR6 Cz9zMk3ZFBixLNuf/i/1FNrixHh2JpQ8wIOq6gWYwfbWBXd54V5c4CdNYjb3uGsO/daXLlhX+ 0No8qvYrF0Moh5LMKxMd4Pu7cdiW1VthLIIvZpvw06/qPR0KquHcDCMZ+CbCG+OdyGkF17Xxj EUjVEjoFY5YfRww1NzeP1u6Bx36dFjzmyhyZxlvGqu3WevoqSJLF8q8vO++fnjbcP/n0NmPrS jqrvZqlL5/LwOB61SeZN4vD8wf3BCt7o+gtJxfz8S/dbsZ4LlozLNwXO/t99CawX/pOrHwkmK qNOzm5BfErc8bEOMH7FaeUlFh4k1gDmxuj4flJnHMHH2aGlNs93W/1stTtuHatCUG8Og= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The newly added mediatek HDMI driver clashes with an API change for struct hdmi_codec_ops, causing an 'allmodconfig' build to fail: drivers/gpu/drm/mediatek/mtk_hdmi.c:1653:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] drivers/gpu/drm/mediatek/mtk_hdmi.c:1654:19: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] drivers/gpu/drm/mediatek/mtk_hdmi.c:1655:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] drivers/gpu/drm/mediatek/mtk_hdmi.c:1656:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] drivers/gpu/drm/mediatek/mtk_hdmi.c:1657:13: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] This changes the API accordingly for the mediatek driver. Signed-off-by: Arnd Bergmann Fixes: 8f83f26891e1 ("drm/mediatek: Add HDMI support") Fixes: efc9194bcff8 ("ASoC: hdmi-codec: callback function will be called with private data") --- The new driver is currently part of Dave Airlie's drm-next tree, while the API change is in Mark Brown's asoc-next tree, so my fix has to be done on top of both. I can see two ways out of this: a) Stephen Rothwell could add my fixup on top of linux-next as a merge fix, and the fix gets sent to Linus Torvalds along with the second of the two branches b) efc9194bcff8 gets merged into drm-next along with my change in the merge commit. It is currently a standalone patch in its own branch in the ASoC tree. --- drivers/gpu/drm/mediatek/mtk_hdmi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c index ba812ef2c9d1..334562d06731 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -1535,7 +1535,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, * HDMI audio codec callbacks */ -static int mtk_hdmi_audio_hw_params(struct device *dev, +static int mtk_hdmi_audio_hw_params(struct device *dev, void *data, struct hdmi_codec_daifmt *daifmt, struct hdmi_codec_params *params) { @@ -1604,7 +1604,7 @@ static int mtk_hdmi_audio_hw_params(struct device *dev, return 0; } -static int mtk_hdmi_audio_startup(struct device *dev) +static int mtk_hdmi_audio_startup(struct device *dev, void *data) { struct mtk_hdmi *hdmi = dev_get_drvdata(dev); @@ -1615,7 +1615,7 @@ static int mtk_hdmi_audio_startup(struct device *dev) return 0; } -static void mtk_hdmi_audio_shutdown(struct device *dev) +static void mtk_hdmi_audio_shutdown(struct device *dev, void *data) { struct mtk_hdmi *hdmi = dev_get_drvdata(dev); @@ -1624,7 +1624,7 @@ static void mtk_hdmi_audio_shutdown(struct device *dev) mtk_hdmi_audio_disable(hdmi); } -int mtk_hdmi_audio_digital_mute(struct device *dev, bool enable) +int mtk_hdmi_audio_digital_mute(struct device *dev, void *data, bool enable) { struct mtk_hdmi *hdmi = dev_get_drvdata(dev); @@ -1638,7 +1638,7 @@ int mtk_hdmi_audio_digital_mute(struct device *dev, bool enable) return 0; } -static int mtk_hdmi_audio_get_eld(struct device *dev, uint8_t *buf, size_t len) +static int mtk_hdmi_audio_get_eld(struct device *dev, void *data, uint8_t *buf, size_t len) { struct mtk_hdmi *hdmi = dev_get_drvdata(dev); -- 2.9.0