Hi Alan, Please ignore this patch. With some additional inputs, we better keep Master and PCM separate.
I'll cook another patch to make this "Master Playback Switch" into a "Master Playback Volume". Thanks! On Mon, Apr 25, 2011 at 04:16:04PM +0800, Lu Guanqun wrote: > Rename it beacase there's a request to use "Master Playback Volume" instead of > "PCM Playback Volume". > > And this renaming makes it more end user friendly. > > Signed-off-by: Lu Guanqun <[email protected]> > --- > drivers/staging/intel_sst/intelmid.h | 2 +- > drivers/staging/intel_sst/intelmid_ctrl.c | 13 ++----------- > 2 files changed, 3 insertions(+), 12 deletions(-) > > diff --git a/drivers/staging/intel_sst/intelmid.h > b/drivers/staging/intel_sst/intelmid.h > index 68ecfbf..f3b9b72 100644 > --- a/drivers/staging/intel_sst/intelmid.h > +++ b/drivers/staging/intel_sst/intelmid.h > @@ -57,7 +57,7 @@ > #define MAX_CHANNEL_DMIC 5 > #define FIFO_SIZE 0 /* fifo not being used */ > #define INTEL_MAD "Intel MAD" > -#define MAX_CTRL_MRST 7 > +#define MAX_CTRL_MRST 6 > #define MAX_CTRL_MFLD 7 > #define MAX_CTRL 7 > #define MAX_VENDORS 4 > diff --git a/drivers/staging/intel_sst/intelmid_ctrl.c > b/drivers/staging/intel_sst/intelmid_ctrl.c > index 51d3ddf..4c3bdce 100644 > --- a/drivers/staging/intel_sst/intelmid_ctrl.c > +++ b/drivers/staging/intel_sst/intelmid_ctrl.c > @@ -772,7 +772,7 @@ struct snd_kcontrol_new > snd_intelmad_controls_mrst[MAX_CTRL] __devinitdata = { > }, > { > .iface = SNDRV_CTL_ELEM_IFACE_MIXER, > - .name = "PCM Playback Volume", > + .name = "Master Playback Volume", > .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, > .info = snd_intelmad_playback_volume_info, > .get = snd_intelmad_volume_get, > @@ -781,7 +781,7 @@ struct snd_kcontrol_new > snd_intelmad_controls_mrst[MAX_CTRL] __devinitdata = { > }, > { > .iface = SNDRV_CTL_ELEM_IFACE_MIXER, > - .name = "PCM Playback Switch", > + .name = "Master Playback Switch", > .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, > .info = snd_intelmad_mute_info, > .get = snd_intelmad_mute_get, > @@ -806,15 +806,6 @@ struct snd_kcontrol_new > snd_intelmad_controls_mrst[MAX_CTRL] __devinitdata = { > .put = snd_intelmad_mute_set, > .private_value = 0, > }, > -{ > - .iface = SNDRV_CTL_ELEM_IFACE_MIXER, > - .name = "Master Playback Switch", > - .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, > - .info = snd_intelmad_mute_info, > - .get = snd_intelmad_mute_get, > - .put = snd_intelmad_mute_set, > - .private_value = 0, > -}, > }; > > struct snd_kcontrol_new > > _______________________________________________ > MeeGo-kernel mailing list > [email protected] > http://lists.meego.com/listinfo/meego-kernel -- guanqun _______________________________________________ MeeGo-kernel mailing list [email protected] http://lists.meego.com/listinfo/meego-kernel
