From patchwork Mon Jun 13 15:39:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102232 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1606302qgf; Mon, 13 Jun 2016 08:40:55 -0700 (PDT) X-Received: by 10.67.22.129 with SMTP id hs1mr22283723pad.105.1465832455540; Mon, 13 Jun 2016 08:40:55 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 13si20527232pfv.7.2016.06.13.08.40.54; Mon, 13 Jun 2016 08:40:55 -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 S1424766AbcFMPkr (ORCPT + 30 others); Mon, 13 Jun 2016 11:40:47 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:57996 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422835AbcFMPkp (ORCPT ); Mon, 13 Jun 2016 11:40:45 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0M2Mj6-1bSmLF3b5I-00s33g; Mon, 13 Jun 2016 17:40:33 +0200 From: Arnd Bergmann To: Mark Brown Cc: Arnd Bergmann , Liam Girdwood , Axel Lin , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: pcm1681/pcm1791: fix typo in declaration Date: Mon, 13 Jun 2016 17:39:45 +0200 Message-Id: <1465832422-2998958-4-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:WPWsM4IdQ1u3dSCwMuZDkANg7iG/gzvdUbf+L0IgxoNjSV+NAib aFo/3UVkFzRe+AaBL26xIj+FUq4VzkwHkLWeTdov/jVDXdET575G96uv54OCcD81q6C2SW4 JZzfTmtGAR7SoSyRnhUL4iIufSgbkLlZ2vymgCwPLnfGM/oGJsJa4SmKmqIgwTwR4GR2d6p wpjisP+NStza0uMnVSO/A== X-UI-Out-Filterresults: notjunk:1; V01:K0:pMcsFurRolk=:g+aCmogRdDpTvgnXhBKYen OjHc7u5xpQuuwDiZZLq63ijzUeCnHMDBqiwcaGuxo//sEfxJnlmOQV/Q7nC0ksTfsErcoNJhb dY1kpMfVLtWGBOyDjZZe9M/D5G/wBKz+QArhL2ujlQ+t7uzIT9/RAFNjHaKVoT0NAwfonyHDR UHKw4Vt12TQHbWveKapqmHJ5tyKX3swxgYJuBLlHk7DYWtPklG+Uu2pFV+QEOUN/2nI4mL4KB yLWimJjPo2Qjg+IpFei8y0CZJKN9aAusyXkYMw3gcwSwoZCx0Cu106t7H+oC1hE7WG1BcSi6c k0qd4lav8CFdMyCHhspmAxEQxRj/ep+arp/JPeg8Yi4u4mhMPF4pn4b5Vn1Z3qLPnZ3MSEoPn 5GWatqcTjrit7NCW9SpJJ1Wl9x26JALVowFLCiSQtpZhmLVMSMQ7gxMTeohiuhnou0fSCdCPq uPr91xLL65Hftc8dNRwzeZghXVMp9eqpQ0RtA19awHFXcV2+GPU9wYqgxnBrqBkdCYtI5Dg2D qQV3g35kGdqKGLLbKF8UIu/VTmVpI3CWmUKiWJeOOk1O1caC55G8BGHC6h6ropCGQ3V8mw6E+ 8tD4nJYtZmY05thDCSv4NQE+4qwB3/IjYmoyf1hcPlVcfXUENamicG3sj/af45YmCj2L9O5LU aBY2yYqZeIWwBDB+FF+PYZjz1xBXGi1YplwwfzsqjTnJpg0KqbhYGSN2eLrPpB+hW+/A= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc -Wextra warns about an obvious but harmless typo in the pcm1681_writeable_reg function, which has an extra 'register keyword', and in pcm179x, which has a second copy of that declaration: sound/soc/codecs/pcm1681.c:76:42: error: 'register' is not at beginning of declaration [-Werror=old-style-declaration] sound/soc/codecs/pcm179x.c:62:42: error: 'register' is not at beginning of declaration [-Werror=old-style-declaration] For consistency with the rest of the file, I'm changing this from 'unsigned register' to 'unsigned int', which has the same meaning but causes no warning. Signed-off-by: Arnd Bergmann --- sound/soc/codecs/pcm1681.c | 2 +- sound/soc/codecs/pcm179x.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.7.0 diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c index 58325234285c..33e1fc2d1598 100644 --- a/sound/soc/codecs/pcm1681.c +++ b/sound/soc/codecs/pcm1681.c @@ -73,7 +73,7 @@ static bool pcm1681_accessible_reg(struct device *dev, unsigned int reg) return !((reg == 0x00) || (reg == 0x0f)); } -static bool pcm1681_writeable_reg(struct device *dev, unsigned register reg) +static bool pcm1681_writeable_reg(struct device *dev, unsigned int reg) { return pcm1681_accessible_reg(dev, reg) && (reg != PCM1681_ZERO_DETECT_STATUS); diff --git a/sound/soc/codecs/pcm179x.c b/sound/soc/codecs/pcm179x.c index 06a66579ca6d..88fbdd184aa0 100644 --- a/sound/soc/codecs/pcm179x.c +++ b/sound/soc/codecs/pcm179x.c @@ -59,7 +59,7 @@ static bool pcm179x_accessible_reg(struct device *dev, unsigned int reg) return reg >= 0x10 && reg <= 0x17; } -static bool pcm179x_writeable_reg(struct device *dev, unsigned register reg) +static bool pcm179x_writeable_reg(struct device *dev, unsigned int reg) { bool accessible;