From patchwork Mon Jan 25 17:07:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8113001 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4F0C2BEEE5 for ; Mon, 25 Jan 2016 17:10:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5C8F020220 for ; Mon, 25 Jan 2016 17:10:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2D3332024C for ; Mon, 25 Jan 2016 17:10:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757913AbcAYRKU (ORCPT ); Mon, 25 Jan 2016 12:10:20 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:54860 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757653AbcAYRJQ (ORCPT ); Mon, 25 Jan 2016 12:09:16 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0LwIKE-1a2OGV0Oly-018696; Mon, 25 Jan 2016 18:08:33 +0100 From: Arnd Bergmann To: Mark Brown Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Kuninori Morimoto , Kukjin Kim , Krzysztof Kozlowski , Sangbeom Kim , Liam Girdwood , linux-samsung-soc@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ASoC: s3c24xx: use const snd_soc_component_driver pointer Date: Mon, 25 Jan 2016 18:07:33 +0100 Message-Id: <1453741678-1988125-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1453741678-1988125-1-git-send-email-arnd@arndb.de> References: <1453741678-1988125-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:COxSBNmG+G9k6UTkkDvTGrFpN2Ky11WXZTNd4X3FNoBKt+Xz3Il 4I6vMCfajlm/XgBdNBacuN7xf3xmBiaPu7pMjRdPh6Z0a/+NMh6CZaQyaLHdU46JSagxmkq cWOzXtyDTES6Acc0h/ljds3LbFflex5Ug2Vv+y1Nbj40e7Y4v9h0vmAGWLG9N6dDFTk+WAb fdA3gOHMSpEYo85lqPDMg== X-UI-Out-Filterresults: notjunk:1; V01:K0:6Xq4fcKV+dY=:gjuNIL3Ts8BxF8uIylT+L3 WkRbPywMW/9SB1Vpgg6D2WGSo0QjX8+OTLWthYxlixMX1ZzgdT5HC2dHz6iYJ8h8NYvM+1mkA ctPTjSPatD2uZfz1IEdPQKmaOCXbsux6dWvZEiabpPjgAvqAidyxQPnjour2eFK3wy8AjcjAO RvY0Knuyi92+7TpdSvMtfrjwZWfbHGdjLGVovmqyToTr4AHfJyub2Nsh1KVkqSmNMfBFd0L7v YTaGvz5a09YzJIXgrVeZLGBNDakfSg89oCa61B8dHKuo3s9MZ7QKLEBIXS5Z34pjFsx78q2pH 2F1LBeZmrBlYmGGtDbKTgpAJyTIdChUewUvbQE9VqAkbA4xosYZ8D8w2CaIZP4tiEDprdwnFO ujrhCw3YHu64NEnofzxLNMIrqldsIbP1JDwsoP5Gprf+JWm/p8Ig4apJ/9WcGgjGEgAOUBS0p t6AsAqmNIvfrt49I4jWZxnj5fI4XOluA5IegUySJb+GOfRUOfO6jskZc6b0MveLqqs0PbX1AY 6mD6gDUNGNEWMJr++KqmVEJhszzfTxZLDIVobvq/PpYFCVzH92OKFFpjWI7c/6PhaWxN3qqdn 1NdQV57TXO+O3CuDUDvtabAd2yR2GbGwPOWkFaFze5BOIWHkKt94BgATgmCwZWq5q3QoEHPHg nBFRIf3cJ4kXFxNKEwkQzqYPZgjebAqUsJT4Pc1iKMuvO+IRkPBM1eZr7F4AUjMIYYSo= Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP An older patch to convert the API in the s3c i2s driver ended up passing a const pointer into a function that takes a non-const pointer, so we now get a warning: sound/soc/samsung/s3c2412-i2s.c: In function 's3c2412_iis_dev_probe': sound/soc/samsung/s3c2412-i2s.c:172:9: error: passing argument 3 of 's3c_i2sv2_register_component' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] However, the s3c_i2sv2_register_component() function again passes the pointer into another function taking a const, so we just need to change its prototype. Signed-off-by: Arnd Bergmann Fixes: eca3b01d0885 ("ASoC: switch over to use snd_soc_register_component() on s3c i2s") Reviewed-by: Krzysztof Kozlowski --- sound/soc/samsung/s3c-i2s-v2.c | 2 +- sound/soc/samsung/s3c-i2s-v2.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c index df65c5b494b1..b6ab3fc5789e 100644 --- a/sound/soc/samsung/s3c-i2s-v2.c +++ b/sound/soc/samsung/s3c-i2s-v2.c @@ -709,7 +709,7 @@ static int s3c2412_i2s_resume(struct snd_soc_dai *dai) #endif int s3c_i2sv2_register_component(struct device *dev, int id, - struct snd_soc_component_driver *cmp_drv, + const struct snd_soc_component_driver *cmp_drv, struct snd_soc_dai_driver *dai_drv) { struct snd_soc_dai_ops *ops = (struct snd_soc_dai_ops *)dai_drv->ops; diff --git a/sound/soc/samsung/s3c-i2s-v2.h b/sound/soc/samsung/s3c-i2s-v2.h index 90abab364b49..d0684145ed1f 100644 --- a/sound/soc/samsung/s3c-i2s-v2.h +++ b/sound/soc/samsung/s3c-i2s-v2.h @@ -101,7 +101,7 @@ extern int s3c_i2sv2_probe(struct snd_soc_dai *dai, * soc core. */ extern int s3c_i2sv2_register_component(struct device *dev, int id, - struct snd_soc_component_driver *cmp_drv, + const struct snd_soc_component_driver *cmp_drv, struct snd_soc_dai_driver *dai_drv); #endif /* __SND_SOC_S3C24XX_S3C_I2SV2_I2S_H */