From patchwork Mon Jun 13 15:39:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102231 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1606461qgf; Mon, 13 Jun 2016 08:41:16 -0700 (PDT) X-Received: by 10.98.98.3 with SMTP id w3mr22880601pfb.127.1465832475999; Mon, 13 Jun 2016 08:41:15 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o124si32801219pfb.247.2016.06.13.08.41.15; Mon, 13 Jun 2016 08:41:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424794AbcFMPlM (ORCPT + 30 others); Mon, 13 Jun 2016 11:41:12 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:55375 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423688AbcFMPlI (ORCPT ); Mon, 13 Jun 2016 11:41:08 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0M0i2I-1bQ25f1Cm6-00umss; Mon, 13 Jun 2016 17:40:57 +0200 From: Arnd Bergmann To: Mark Brown Cc: Arnd Bergmann , Liam Girdwood , Kuninori Morimoto , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: rcar: fix 'const static' variables Date: Mon, 13 Jun 2016 17:39:46 +0200 Message-Id: <1465832422-2998958-5-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1465832422-2998958-1-git-send-email-arnd@arndb.de> References: <1465832422-2998958-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:Iv8f+bCaFgNgf6Kx68bs3f0cB9EAjY7+oRV/iI3OqO57EKBJytt qwGmygJcvrjIn8lgfSyMTybO7hDKIgXcxjurF+fYmguXsSEj/rYfhlUx6wjS3tuxzuqZBBJ mhFh2j2W6EbHfHO/tirVoYFlPXmqceSGSb0lotWlsoMXMfI+zZdlch2k+L5HcPKfrRSZJhF 2Wvve2AIGX2u8bhbZVhjA== X-UI-Out-Filterresults: notjunk:1; V01:K0:+JXkXxQ5Hgc=:bRG2g22CMQwffatKl4RMoW uM/cdhz0zUvgCFsmZO5Si9u0e2nFAXdS+cBTAOqsBo8lBIw0lzATo20OsrzKD/vgRo9LZ/tBN rJDBSFOBjTNwrvuJSHJv2PLPLF6FXmDRRXlMwJ1NgitXRMwRkJub2vTSId5XIXJGfutkdZmc5 eG/P8VO7hvy/Dd1P2Q4eQlyRcuUnUbjuYSWCWcOsg5RbSKeei0gZDOKZ0ijcb14bCLgA1xM05 d4f0SvEfeVA86bYf62yUnFxe5I8yYtlpzQkMHS2KRPyajxA/vQLy9qEg++9LZfHHcYx2ZL0WR VVgaPT3lVZocWTGplEqH5XXhBpbYUBcUNzfuMdPAffnp/IA5BLFxj+J0P198+msvEk4kTdLXx ZeAwuEEVqoVXfdHKyujGr1tLbZTyhgLrOesoKufUgWe77Pd3wqtOozi8sgMkPdekBchiec5FX ULgiKuttfkdxezzsgiF66WjAAAph1SLMZEjaQe3LPqR1uP2miZAQrf2I8PJ8I7MHB5qGVa4Ph m1OgU4ZNbAB7ursHCdk2vhttkrWgOmKiCwEBx80Jh7k5aiJtuEIHjlCHG4cq226vdiKSo1SzQ FILVqNhYXgWlFYKrT3XcmVcU8n9osOddsI5/H14c8q82QLXtmgmTgKUsaJohoJHWz9IxiIH1X h4tIh+RWVquJpUuYv0zD4up0HyGYqOobAPF1HvWB5T09HmhUSiq06hcOKPu6mpFFR/tc= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When building with 'make W=1', we get a harmless warning about slightly incorrect prototypes in the rcar audio driver: sound/soc/sh/rcar/gen.c: In function 'rsnd_gen2_probe': sound/soc/sh/rcar/gen.c:209:2: error: 'static' is not at beginning of declaration [-Werror=old-style-declaration] This changes the 'const static' to 'static const' as it should be. Signed-off-by: Arnd Bergmann --- sound/soc/sh/rcar/gen.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.7.0 diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index 46c0ba7b6414..7d2fdf8dd188 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c @@ -206,7 +206,7 @@ static int _rsnd_gen_regmap_init(struct rsnd_priv *priv, */ static int rsnd_gen2_probe(struct rsnd_priv *priv) { - const static struct rsnd_regmap_field_conf conf_ssiu[] = { + static const struct rsnd_regmap_field_conf conf_ssiu[] = { RSND_GEN_S_REG(SSI_MODE0, 0x800), RSND_GEN_S_REG(SSI_MODE1, 0x804), RSND_GEN_S_REG(SSI_MODE2, 0x808), @@ -221,7 +221,7 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv) RSND_GEN_M_REG(SSI_INT_ENABLE, 0x18, 0x80), }; - const static struct rsnd_regmap_field_conf conf_scu[] = { + static const struct rsnd_regmap_field_conf conf_scu[] = { RSND_GEN_M_REG(SRC_I_BUSIF_MODE,0x0, 0x20), RSND_GEN_M_REG(SRC_O_BUSIF_MODE,0x4, 0x20), RSND_GEN_M_REG(SRC_BUSIF_DALIGN,0x8, 0x20), @@ -308,7 +308,7 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv) RSND_GEN_M_REG(DVC_VOL7R, 0xe44, 0x100), RSND_GEN_M_REG(DVC_DVUER, 0xe48, 0x100), }; - const static struct rsnd_regmap_field_conf conf_adg[] = { + static const struct rsnd_regmap_field_conf conf_adg[] = { RSND_GEN_S_REG(BRRA, 0x00), RSND_GEN_S_REG(BRRB, 0x04), RSND_GEN_S_REG(SSICKR, 0x08), @@ -328,7 +328,7 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv) RSND_GEN_S_REG(SRCOUT_TIMSEL4, 0x58), RSND_GEN_S_REG(CMDOUT_TIMSEL, 0x5c), }; - const static struct rsnd_regmap_field_conf conf_ssi[] = { + static const struct rsnd_regmap_field_conf conf_ssi[] = { RSND_GEN_M_REG(SSICR, 0x00, 0x40), RSND_GEN_M_REG(SSISR, 0x04, 0x40), RSND_GEN_M_REG(SSITDR, 0x08, 0x40), @@ -359,14 +359,14 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv) static int rsnd_gen1_probe(struct rsnd_priv *priv) { - const static struct rsnd_regmap_field_conf conf_adg[] = { + static const struct rsnd_regmap_field_conf conf_adg[] = { RSND_GEN_S_REG(BRRA, 0x00), RSND_GEN_S_REG(BRRB, 0x04), RSND_GEN_S_REG(SSICKR, 0x08), RSND_GEN_S_REG(AUDIO_CLK_SEL0, 0x0c), RSND_GEN_S_REG(AUDIO_CLK_SEL1, 0x10), }; - const static struct rsnd_regmap_field_conf conf_ssi[] = { + static const struct rsnd_regmap_field_conf conf_ssi[] = { RSND_GEN_M_REG(SSICR, 0x00, 0x40), RSND_GEN_M_REG(SSISR, 0x04, 0x40), RSND_GEN_M_REG(SSITDR, 0x08, 0x40),