From patchwork Thu May 18 13:35:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 100107 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp724912qge; Thu, 18 May 2017 06:37:57 -0700 (PDT) X-Received: by 10.84.198.36 with SMTP id o33mr5079386pld.145.1495114676963; Thu, 18 May 2017 06:37:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495114676; cv=none; d=google.com; s=arc-20160816; b=hroxNBRsx6vs7HHztHXiW0lJRa2lad1kxxBIaPn7ZBLOut1q1a8xr0YmQDCZ9VyQCL vahmgzRzOmBJToqyUuGEEp4M7Se0XgdELzPB5Dn3ixoNKHiJKegoWCUoDmz01r6P/0Vc NBvNtSPMJZBJUUcxb9PsN81LfdLkWi2QLbf+e34eov3TlaDluyvbOn8vPnFFIEfrQED7 jl2cRa+8ABMDCklF2jf0xWdTAAQgfB31ASqJZ6kDzmU8HVx5V98WILqeWnPDMyb37Buf PpoqmrYU39rVNSapYWCJmGlmMoUGG0qBO9kGiT9eXPQqmOfYIbCxa1IgGiuGxdffvVlb btig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=U4bYotOM72jTN4Pe7GqtOTyWE0FRh3iEkzqQsvd7hz0=; b=VlJlAQNpe3f4oLf8xihQgbC/c9twOd+3Ia1ZCZ+ofL1sFKZCLvcrseWJ61+2ODI8Un bTNmk5lTAjCzArj/bZyoVFn1Su2cEKQ68stffXh2we2cELTh2oCwbBcuAqnaDcqkASCX IiQOHkLI9cayCs5uhGwJNiT8ke3G+pb/tExUKTNNCFCP6lKXEKZ126wBCOTNbF37fvcM zMO9etfG5fw8Nm/jfeP2aRJELjRv/VyWJEZx8CXk1/gnzdPHwKmjDsQehF6lz8jmsG+l P8iSKl+YsNyW+4EjO3Lb+cu0/WzeIAkjXXxlYKuu/jLlHxW1cjhVsfLwbrLzqXbUhFMY E79A== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s186si5313076pgs.96.2017.05.18.06.37.56; Thu, 18 May 2017 06:37:56 -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 S1755661AbdERNhq (ORCPT + 25 others); Thu, 18 May 2017 09:37:46 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:65323 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755286AbdERNhl (ORCPT ); Thu, 18 May 2017 09:37:41 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lla0h-1djaHr3aKt-00bGfT; Thu, 18 May 2017 15:36:12 +0200 From: Arnd Bergmann To: Takashi Iwai Cc: Arnd Bergmann , Jaroslav Kysela , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] ALSA: pcm: use "do {} while (0)" for empty macro Date: Thu, 18 May 2017 15:35:54 +0200 Message-Id: <20170518133610.1914235-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:IlafpS9osvFS2tAnYKINI0q03k7wq6tm0KoVYqu+YSjiOn+e8iB /swLRJpU4cKRJj239OmQ6KyJVOmXfoLP52D+nqArg+wY3b84ypD0zrS/rW2M1eXDAaEof5Y BiqRyDjdRW9hDCWdTcMhxCH1IFC3bfmDUlvubl57tlU0WEop9SvkBzLAhBb4Cfp9sNpr7oU qaK9ppEFVCO9e4/Ghp2uQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:mGLdsMW0LSg=:fw/tQbxWmAOWabErHblGja rsqS/ifE7Ytzq35ru6FtNPIG70eEIfDB1xvyj3dKyBXulzDhT4HHGQgb9xcgC/ACdZV6WeKRJ x+du7KnU1tEc6SoLoCh2yUf8PvSu2FekIR8350Mf/BDchzsL25IQ9z8vUA0an6ghtmb6JrPCw 61p502qU3T5kBDGN4zzWmG7/OdABobdwd2xASFNF+Qwf4DGT4M438ZzANO8JaW3g50vf8Zwi5 6XE2T6Rjv/oq1jIw3EntbhnRkIeQd1XUPllTkUiHhzY/OQ2jTl/lxZzRtQhso3ihW1K863/Ud Y8h0WwYuFTDO8u3/5SYE8XgCHUfy8kTc8clZaX77tvo3unad8+O7MbiuR4kRxHfnQ4+G+UzYp z3i4hDMGsxUeyf2IX5WX0/VpeLp/AW5KnBkyvRohnm6NFH0UC9tnW5geZLjyMDewkuX8MOTpC 5bv6FQjkOeGM5rCeAKUZ/z3AGdxCbykZbr8GpIP5n5ndrVjvW4zTp7ZV6t076ViXUMswscFMr STRB3KrSxBI1IbDHwDA53f+r7h1qycZ6jaUvVBYL1paFBWc8quaWq2ZpSay6esUkf72vr0ZiY +q+PvVcxF+Xh0ZDYqNGdu43IIhWRDIyUvjQx4BaJlssFqRCVhpsBSjBWIp0V9DgrfG6Xo0Hom 1MUhl58eTsam2Tiu1PObFO18zomgtgDB4Jspo851uHk523k2rX35pDDyT/8Aw7s5U2jE= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Recent compilers produce a harmless warning for the new pcm_call_notify() macro when CONFIG_SND_PCM_OSS is disabled: sound/core/pcm.c: In function 'snd_pcm_free': sound/core/pcm.c:905:37: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body] This turns the empty macro into a 'do {} while (0)' statement to avoid the warning. Fixes: 58f30d650c7f ("ALSA: pcm: Build pcm notifier code conditionally") Signed-off-by: Arnd Bergmann --- sound/core/pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 24acbfb5c531..d30dba0ee688 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -894,7 +894,7 @@ static void snd_pcm_free_stream(struct snd_pcm_str * pstr) _notify->call(pcm); \ } while (0) #else -#define pcm_call_notify(pcm, call) /* NOP */ +#define pcm_call_notify(pcm, call) do {} while (0) #endif static int snd_pcm_free(struct snd_pcm *pcm) From patchwork Thu May 18 13:35:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 100106 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp724522qge; Thu, 18 May 2017 06:36:57 -0700 (PDT) X-Received: by 10.84.134.132 with SMTP id 4mr5137644plh.61.1495114617741; Thu, 18 May 2017 06:36:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495114617; cv=none; d=google.com; s=arc-20160816; b=iNd1xJBP4MUhAeuhb1yNU/ek/NrThjERX3yihBiudyCFzBE84dmuHjIVolfh0VI1le kBB/2Sqlhj7tLewaJi4SVYJDXpx7wQBHULm6ds1nbg/5aMHdWT3eqClJNe9xd/GCW0yO YyMS/yvlTt3VvdUIwcVGdu8P9TyV4ONm6iscWvEAnLrj2u1Hjy7K7ZPF4y6PykkEHCae e+M44bQHs4XN+aaP1AEU/uXrR+qKbs6AL2tNdJ5hRwOJXcYkdpDEy1gmyENCnOoKZZP7 KWI63e5dJbKYmQlCjnNh08TArvkp8f/W6jlwxDVoJSZft3HLkehMKVygfTrJm0BEzlcr sbIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=E0Kncgay/rL1MbWxwyPOA24yGMS4j+a0ttJnonBAkOk=; b=f4K1Sx/qHkCdkOOZeE02nNtEZV8pOnraqa0i/zlHAFyYNV9ldnuQH00dtze5RDzMbt 07axu9TmD2p/yobtxppC+Ps3QINpTtuEhIp45KB2R9m4B4xVlJydnYghU0el90QkpWKW 5VLjOIZ4up/BaFvQUdvBGnngUn4pDvHJYAHodhXac+ejPSUAfrWurHy0eIkTk6U+sBKv YBvFV0OaiJnphQCVU75wmPNndi0Tzi1SNCgNrtWwJ99RTOf2uDVTelW6wgiUBgZZbft6 +4Y+ULhey42syFZxXMoB1AY683QUP9lG+a3DqCeSYIOYiC1WZ8wzADYCyEliLuEzMOq6 1tfw== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u195si5360609pgc.315.2017.05.18.06.36.57; Thu, 18 May 2017 06:36:57 -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 S932158AbdERNgu (ORCPT + 25 others); Thu, 18 May 2017 09:36:50 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:58000 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932162AbdERNgp (ORCPT ); Thu, 18 May 2017 09:36:45 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0LqpCY-1dgZc81TPO-00eJbq; Thu, 18 May 2017 15:36:26 +0200 From: Arnd Bergmann To: Takashi Iwai Cc: Arnd Bergmann , Jaroslav Kysela , Takashi Sakamoto , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ALSA: pcm/oss: mark snd_pcm_plug_slave_format arg as const Date: Thu, 18 May 2017 15:35:55 +0200 Message-Id: <20170518133610.1914235-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170518133610.1914235-1-arnd@arndb.de> References: <20170518133610.1914235-1-arnd@arndb.de> X-Provags-ID: V03:K0:3BTuJF+BX8QFBOe5Pyjfm/pgC4jIm2bBDnY1udMtQ5F19Y6dGeU G9/JkwEeXsINSqoH18nFy/etgfJdeIcocCxb7CHmchVMMl2isxDMI7JkDGecEW/S5Mc/7or t3RRYyRYgqEytWEYWbSDHR2LF3g/BOOHmw/N/QRfpqhOVjIX66CCXdh1ZOVDiKecT6lAGNY 0RaXOT0vN9QzNlZjVPI7A== X-UI-Out-Filterresults: notjunk:1; V01:K0:mJhJc1ynJbg=:GG0gaWmDfs9BTro22wXVm/ j1g5WlOjzDC25JG0y4ylm/cSl5lZUwVKJHoUrisJR9rqPoGtnpqN60dLefXfDzAx4C3/dtB/D 2+KNUJhJF5k2ozgKPEa//4vqvJri85QA2aFBP1dv4F/kgNO1SCsOLe557p4sEXO6w2cQ5dgCZ qgrhnx59ntjFKvJui1VJa6gJXxcORHYqFLkoWXpHzGUNRXiudNtPeoIJqWodF6lKPA3hSBxlD 0Ws1W0Aq9l8oYKQ0FgbR3HGjPr9ouBcIHnNKDqqtVTgIFN6KzWZ4AljZmYw+njY54pg4BM9q2 HEtIXDAfAGWqGLq8VZks9z6+ypm9YSxjLQj69zcty7j6ycfsf+1+yvVlaL4gD08sR4hyD0W/8 LIypn7g9/8VSmZvAKQDFvrC2ukCwxWPSW/k6HiG73otFZYf08l5eIYjzZsTQ+bH/OeJ2olOGJ NkfEu75F1ZyvgwOeaSRgE9EDIfW8E0z2qbmzgWP7pwDsbfgqYZddXpsDnoXidGMWXMuCFvtKQ T/qQF4t2baBMspTY7Ucv/YuSo2+byWbYQRpRznjkA2ujJPfWBd2rIr3SOpgxqVp3JFzPgbmCS +O4VCKv/LbUjBBHeu029DHC2PNYrGVQIAwbaff1wrFe6E2TdYi74bJXAvnBDLqRfW9bFoclOQ IM9tmmnZWkynUUny1ekGhaN7P9M+3e/qZjc0X6Obb4xT/Z4vKiFFI3uGLbOAN1VZmqc4= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Only one of the two declarations has the const modifier in the argument list, so we get a warning when CONFIG_SND_PCM_OSS_PLUGINS is disabled: sound/core/oss/pcm_oss.c: In function 'snd_pcm_oss_change_params': sound/core/oss/pcm_oss.c:898:47: error: passing argument 2 of 'snd_pcm_plug_slave_format' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] This makes the two declarations match again. Fixes: e76bf3c4b4e4 ("ALSA: pcm/oss: refer to parameters instead of copying to reduce usage of kernel stack") Signed-off-by: Arnd Bergmann --- sound/core/oss/pcm_plugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/sound/core/oss/pcm_plugin.h b/sound/core/oss/pcm_plugin.h index 38e2c14cb893..73c068abaca5 100644 --- a/sound/core/oss/pcm_plugin.h +++ b/sound/core/oss/pcm_plugin.h @@ -172,7 +172,7 @@ snd_pcm_sframes_t snd_pcm_oss_readv3(struct snd_pcm_substream *substream, static inline snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t drv_size) { return drv_size; } static inline snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t clt_size) { return clt_size; } -static inline int snd_pcm_plug_slave_format(int format, struct snd_mask *format_mask) { return format; } +static inline int snd_pcm_plug_slave_format(int format, const struct snd_mask *format_mask) { return format; } #endif