sound/pci/hda: Rename capture sources of CX20549 to match common conventions
PATCH 2/6 sound/pci/hda: Rename capture sources of CX20549 to match common conventions
sound/pci/hda/patch_conexant.c +7 -7
@@ -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 }, {"Mixer" ,0x0 }, } };
@@ -706,8 +706,8 @@ static const struct hda_input_mux cxt5045_capture_source_benq = {static const struct hda_input_mux cxt5045_capture_source_hp530 = { .num_items =2 , .items = { - {"ExtMic" ,0x1 }, - {"IntMic" ,0x2 }, + {"Mic" ,0x1 }, + {"Internal Mic" ,0x2 }, } };
Signature · 1 line
1.7.9.1
At Thu, 05 Apr 2012 15:30:06 +0200,
Quoted 16 lines · Michael Karcher
sound/pci/hda/patch_conexant.c +2
-2@@ -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 }, } };
sound/pci/hda/patch_conexant.c static const struct hda_channel_mode cxt5045_modes[1] = { · line 701
Quoted 10 lines
sound/pci/hda/patch_conexant.c +3
-3static 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