From patchwork Wed Jun 29 14:51:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9205519 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3DE2A607D8 for ; Wed, 29 Jun 2016 14:49:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F01528666 for ; Wed, 29 Jun 2016 14:49:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 22F562866B; Wed, 29 Jun 2016 14:49:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DA2C28666 for ; Wed, 29 Jun 2016 14:49:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 96D3A6E40E; Wed, 29 Jun 2016 14:49:26 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id E9FD86E410 for ; Wed, 29 Jun 2016 14:49:24 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue001) with ESMTPA (Nemesis) id 0M8F86-1bUh0U0ANO-00w0qu; Wed, 29 Jun 2016 16:48:56 +0200 From: Arnd Bergmann To: David Airlie , Mark Brown 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= Cc: Stephen Rothwell , alsa-devel@alsa-project.org, Junzhi Zhao , Jie Qiu , Kuninori Morimoto , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Arnd Bergmann , Matthias Brugger X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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") Acked-by: Kuninori Morimoto --- 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);