From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933079AbbGHHlu (ORCPT ); Wed, 8 Jul 2015 03:41:50 -0400 Received: from cantor2.suse.de ([195.135.220.15]:58816 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934298AbbGHHlX (ORCPT ); Wed, 8 Jul 2015 03:41:23 -0400 Date: Wed, 08 Jul 2015 09:41:21 +0200 Message-ID: From: Takashi Iwai To: "Maciej S. Szmigiero" Cc: "alsa-devel@alsa-project.org" , Jaroslav Kysela , Michael Gernoth , linux-kernel Subject: Re: [PATCH 1/3] emu10k1: remove unused AC'97 mixer controls on Audigy In-Reply-To: <559C2DF8.5030809@maciej.szmigiero.name> References: <559C2DF8.5030809@maciej.szmigiero.name> 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/24.5 (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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Tue, 07 Jul 2015 21:52:24 +0200, Maciej S. Szmigiero wrote: > > AC'97 Headphone output and EAPD control aren't used > on Audigy so remove them from mixer. > > Also remove AC'97 3D control as the driver is > already doing for Audigys with 1361T ADC. > > Signed-off-by: Maciej Szmigiero Thanks, applied all three patches now. Takashi > --- > sound/pci/emu10k1/emumixer.c | 11 ++++++----- > 1 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c > index 55e5716..f1cb7b3 100644 > --- a/sound/pci/emu10k1/emumixer.c > +++ b/sound/pci/emu10k1/emumixer.c > @@ -1830,10 +1830,16 @@ int snd_emu10k1_mixer(struct snd_emu10k1 *emu, > "Capture Switch", > "Capture Volume", > "Mic Select", > + "Headphone Playback Switch", > + "Headphone Playback Volume", > + "3D Control - Center", > + "3D Control - Depth", > + "3D Control - Switch", > "Video Playback Switch", > "Video Playback Volume", > "Mic Playback Switch", > "Mic Playback Volume", > + "External Amplifier", > NULL > }; > static char *audigy_rename_ctls[] = { > @@ -1996,11 +2002,6 @@ int snd_emu10k1_mixer(struct snd_emu10k1 *emu, > rename_ctl(card, "Analog Mix Capture Volume", "Line2 Capture Volume"); > rename_ctl(card, "Aux2 Capture Volume", "Line3 Capture Volume"); > rename_ctl(card, "Mic Capture Volume", "Unknown1 Capture Volume"); > - remove_ctl(card, "Headphone Playback Switch"); > - remove_ctl(card, "Headphone Playback Volume"); > - remove_ctl(card, "3D Control - Center"); > - remove_ctl(card, "3D Control - Depth"); > - remove_ctl(card, "3D Control - Switch"); > } > if ((kctl = emu->ctl_send_routing = snd_ctl_new1(&snd_emu10k1_send_routing_control, emu)) == NULL) > return -ENOMEM; >