From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B822C433C1 for ; Fri, 26 Mar 2021 08:12:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A8DB261A2B for ; Fri, 26 Mar 2021 08:12:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229639AbhCZILg (ORCPT ); Fri, 26 Mar 2021 04:11:36 -0400 Received: from mx2.suse.de ([195.135.220.15]:44836 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229528AbhCZILL (ORCPT ); Fri, 26 Mar 2021 04:11:11 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 7CEA8AB8A; Fri, 26 Mar 2021 08:11:10 +0000 (UTC) Date: Fri, 26 Mar 2021 09:11:10 +0100 Message-ID: From: Takashi Iwai To: Kai-Heng Feng Cc: tiwai@suse.com, Jaroslav Kysela , Joe Perches , Lars-Peter Clausen , Mark Brown , Tom Yan , Chris Chiu , alsa-devel@alsa-project.org (moderated list:SOUND), linux-kernel@vger.kernel.org (open list) Subject: Re: [PATCH v3 1/2] ALSA: usb-audio: Carve out connector value checking into a helper In-Reply-To: <20210325165918.22593-1-kai.heng.feng@canonical.com> References: <20210325165918.22593-1-kai.heng.feng@canonical.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 25 Mar 2021 17:59:12 +0100, Kai-Heng Feng wrote: > > This is preparation for next patch, no functional change intended. > > Signed-off-by: Kai-Heng Feng Applied now. Thanks. Takashi > --- > v3: > - No change. > v2: > - Only return early when ret < 0. > > sound/usb/mixer.c | 34 +++++++++++++++++++++++++--------- > 1 file changed, 25 insertions(+), 9 deletions(-) > > diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c > index b004b2e63a5d..5a2d9a768f70 100644 > --- a/sound/usb/mixer.c > +++ b/sound/usb/mixer.c > @@ -1446,13 +1446,11 @@ static int mixer_ctl_master_bool_get(struct snd_kcontrol *kcontrol, > return 0; > } > > -/* get the connectors status and report it as boolean type */ > -static int mixer_ctl_connector_get(struct snd_kcontrol *kcontrol, > - struct snd_ctl_elem_value *ucontrol) > +static int get_connector_value(struct usb_mixer_elem_info *cval, > + char *name, int *val) > { > - struct usb_mixer_elem_info *cval = kcontrol->private_data; > struct snd_usb_audio *chip = cval->head.mixer->chip; > - int idx = 0, validx, ret, val; > + int idx = 0, validx, ret; > > validx = cval->control << 8 | 0; > > @@ -1467,21 +1465,24 @@ static int mixer_ctl_connector_get(struct snd_kcontrol *kcontrol, > ret = snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), UAC2_CS_CUR, > USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, > validx, idx, &uac2_conn, sizeof(uac2_conn)); > - val = !!uac2_conn.bNrChannels; > + if (val) > + *val = !!uac2_conn.bNrChannels; > } else { /* UAC_VERSION_3 */ > struct uac3_insertion_ctl_blk uac3_conn; > > ret = snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), UAC2_CS_CUR, > USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, > validx, idx, &uac3_conn, sizeof(uac3_conn)); > - val = !!uac3_conn.bmConInserted; > + if (val) > + *val = !!uac3_conn.bmConInserted; > } > > snd_usb_unlock_shutdown(chip); > > if (ret < 0) { > - if (strstr(kcontrol->id.name, "Speaker")) { > - ucontrol->value.integer.value[0] = 1; > + if (name && strstr(name, "Speaker")) { > + if (val) > + *val = 1; > return 0; > } > error: > @@ -1491,6 +1492,21 @@ static int mixer_ctl_connector_get(struct snd_kcontrol *kcontrol, > return filter_error(cval, ret); > } > > + return ret; > +} > + > +/* get the connectors status and report it as boolean type */ > +static int mixer_ctl_connector_get(struct snd_kcontrol *kcontrol, > + struct snd_ctl_elem_value *ucontrol) > +{ > + struct usb_mixer_elem_info *cval = kcontrol->private_data; > + int ret, val; > + > + ret = get_connector_value(cval, kcontrol->id.name, &val); > + > + if (ret < 0) > + return ret; > + > ucontrol->value.integer.value[0] = val; > return 0; > } > -- > 2.30.2 >