From patchwork Mon Jul 4 13:16:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9212627 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 30BF560572 for ; Mon, 4 Jul 2016 13:14:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20003286F4 for ; Mon, 4 Jul 2016 13:14:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10965286F7; Mon, 4 Jul 2016 13:14:19 +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 80A5C286F4 for ; Mon, 4 Jul 2016 13:14:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BB1BF6E2F3; Mon, 4 Jul 2016 13:14:15 +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.130]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1CFA46E2F3 for ; Mon, 4 Jul 2016 13:14:13 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0MWseJ-1ami4d2kFn-00XpTa; Mon, 04 Jul 2016 15:13:56 +0200 From: Arnd Bergmann To: David Airlie , Mark Brown Subject: [PATCH] drm: sti: fix prototypes after API change Date: Mon, 4 Jul 2016 15:16:51 +0200 Message-Id: <20160704131651.1083630-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:iPtC+56TZ7TP9TyQYUk6Nw7ZIbp7jv4iZHkWiEe5Ug9ODMB7/6e xTC2MQTeHhGkOdUdyzk176WU4PxSng1uYg/kfJ+9fCn4C6DY9gFGTI6ryeL6Nek3zXJRyT8 zYqcZevuHBw4P3nPcU9DSeC8RY5RWOQwtgEseDsXE8xcdmG4p9meo/nbB87rplFcWotTEz8 Ec6xBLtO6k17ghvnLZChQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:id6lkmFFMQI=:Qwrc/FUaDzgEbtoVjym+OT cN7NeNQMnEgfnZk41Rflg8GdMseae9ex/oVQSf76SvVm1IHsmfIO0Q3CQ1kqR2i1bhx2K4pFm BS9TZgBWITpJmRl0yrjiBsbyXRsxLaCQccOBo/qme83rphtWvKXPxjzOx4SfNGbAHJvavE9AD ogksrSu7HchkFYcpbxSKJJOZay3avTKR/KzFZmI9YNJkJgXh/5cH5jEzWemtS4TrfkQ1plpa5 pdTdkEfwhOwxSzQA0AS9R9QDi4z6CS2O62P8DNcXeGWusRXf2v3aAVuUgNhaArJG0RN/AQCxg 2lSDxK9zBrTNcYoL9riqAd7KCuy2FcIyjWxAvhj0Ue7wjydbMtiafc6zssrmIoQzi7JJ24zCu LrfrHXGxNlWrd/gHkaj/3F+AE73heBAxiavAxCYYQjAGP0WbkKcbzZa7CWoU2afAi6zBN8CAG YQRW8ZoGTUMt0Mnondbl5fHMN20M37WrFuzpEAQnWkyyxkA80zeT9qG5pWChaJitzTIvWp15/ +UYq5Gj1dVztc+OC5wd87P+t2o/ccvYmiscI7kHythdIr+5/3KZ4Z5OkySmo/bc1Ro0insTv1 JOLOlBcay55cIe60cT8MwvRihbsPKrPAoeGw4N2qfs2DdH1cfX3V9Hb3KzfYcChsXRpviIAg4 UqxeK78aGpb5ZyAL7JpmbWN+m4JXAYWenIdyX31hP9qJfh32wMgsuSsbv3PiGkv+3LQ0= Cc: Stephen Rothwell , alsa-devel@alsa-project.org, kernel@stlinux.com, Kuninori Morimoto , Arnaud Pouliquen , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Arnd Bergmann 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 Like the mediatek hdmi driver, the sti driver now suffers from an API change in linux-next: drivers/gpu/drm/sti/sti_hdmi.c:1250:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] .hw_params = hdmi_audio_hw_params, ^~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/sti/sti_hdmi.c:1250:15: note: (near initialization for 'audio_codec_ops.hw_params') This follows the API change, adding the extra function arguments. I suppose we want this to be part of the ASoC merge in linux-next for now too. Signed-off-by: Arnd Bergmann Fixes: 2c348e505328 ("drm: sti: Add ASoC generic hdmi codec support.") Fixes: efc9194bcff8 ("ASoC: hdmi-codec: callback function will be called with private data") Link: https://lkml.org/lkml/2016/6/29/441 Acked-by: Benjamin Gaignard --- drivers/gpu/drm/sti/sti_hdmi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c index 927e2b2e5af2..fedc17f98d9b 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c @@ -1169,7 +1169,7 @@ static int hdmi_audio_configure(struct sti_hdmi *hdmi, return hdmi_audio_infoframe_config(hdmi); } -static void hdmi_audio_shutdown(struct device *dev) +static void hdmi_audio_shutdown(struct device *dev, void *data) { struct sti_hdmi *hdmi = dev_get_drvdata(dev); int audio_cfg; @@ -1186,6 +1186,7 @@ static void hdmi_audio_shutdown(struct device *dev) } static int hdmi_audio_hw_params(struct device *dev, + void *data, struct hdmi_codec_daifmt *daifmt, struct hdmi_codec_params *params) { @@ -1221,7 +1222,7 @@ static int hdmi_audio_hw_params(struct device *dev, return 0; } -static int hdmi_audio_digital_mute(struct device *dev, bool enable) +static int hdmi_audio_digital_mute(struct device *dev, void *data, bool enable) { struct sti_hdmi *hdmi = dev_get_drvdata(dev); @@ -1235,7 +1236,7 @@ static int hdmi_audio_digital_mute(struct device *dev, bool enable) return 0; } -static int hdmi_audio_get_eld(struct device *dev, uint8_t *buf, size_t len) +static int hdmi_audio_get_eld(struct device *dev, void *data, uint8_t *buf, size_t len) { struct sti_hdmi *hdmi = dev_get_drvdata(dev); struct drm_connector *connector = hdmi->drm_connector;