From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932163AbdERNgu (ORCPT ); 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 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 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(-) 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 -- 2.9.0