From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752902Ab2DEO30 (ORCPT <rfc822;w@1wt.eu>);
	Thu, 5 Apr 2012 10:29:26 -0400
Received: from cantor2.suse.de ([195.135.220.15]:33408 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751638Ab2DEO3Z (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 5 Apr 2012 10:29:25 -0400
Date: Thu, 05 Apr 2012 16:29:24 +0200
Message-ID: <s5hhawyfe0r.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
Cc: Jaroslav Kysela <perex@perex.cz>, alsa-devel@alsa-project.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/6] sound/pci/hda: Rename capture sources of CX20549 to match common conventions
In-Reply-To: <1333632606.4159.12.camel@localhost>
References: <1333632606.4159.12.camel@localhost>
User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.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
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

At Thu, 05 Apr 2012 15:30:06 +0200,
Michael Karcher wrote:
> 
> diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
> index 8c6523b..7d92aac 100644
> --- a/sound/pci/hda/patch_conexant.c
> +++ b/sound/pci/hda/patch_conexant.c
> @@ -687,18 +687,18 @@ static const struct hda_channel_mode cxt5045_modes[1] = {
>  static const struct hda_input_mux cxt5045_capture_source = {
>  	.num_items = 2,
>  	.items = {
> -		{ "IntMic", 0x1 },
> -		{ "ExtMic", 0x2 },
> +		{ "Internal Mic", 0x1 },
> +		{ "Mic", 0x2 },
>  	}
>  };
>  
>  static const struct hda_input_mux cxt5045_capture_source_benq = {
>  	.num_items = 5,
>  	.items = {
> -		{ "IntMic", 0x1 },
> -		{ "ExtMic", 0x2 },
> -		{ "LineIn", 0x3 },
>  		{ "CD",     0x4 },
> +		{ "Internal Mic", 0x1 },
> +		{ "Mic", 0x2 },
> +		{ "Line In", 0x3 },

This could be simply "Line".
Other than that, looks good.


Takashi