lkml.org 
[lkml]   [2011]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[22/71] ASoC: Explicitly say registerless widgets have no register
    2.6.33-longterm review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Mark Brown <broonie@opensource.wolfsonmicro.com>

    commit 0ca03cd7d0fa3bfbd56958136a10f19733c4ce12 upstream.

    This stops code that handles widgets generically from attempting to access
    registers for these widgets.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Acked-by: Liam Girdwood <lrg@ti.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    include/sound/soc-dapm.h | 16 ++++++++--------
    1 file changed, 8 insertions(+), 8 deletions(-)

    --- a/include/sound/soc-dapm.h
    +++ b/include/sound/soc-dapm.h
    @@ -46,25 +46,25 @@
    /* platform domain */
    #define SND_SOC_DAPM_INPUT(wname) \
    { .id = snd_soc_dapm_input, .name = wname, .kcontrols = NULL, \
    - .num_kcontrols = 0}
    + .num_kcontrols = 0, .reg = SND_SOC_NOPM }
    #define SND_SOC_DAPM_OUTPUT(wname) \
    { .id = snd_soc_dapm_output, .name = wname, .kcontrols = NULL, \
    - .num_kcontrols = 0}
    + .num_kcontrols = 0, .reg = SND_SOC_NOPM }
    #define SND_SOC_DAPM_MIC(wname, wevent) \
    { .id = snd_soc_dapm_mic, .name = wname, .kcontrols = NULL, \
    - .num_kcontrols = 0, .event = wevent, \
    + .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
    .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD}
    #define SND_SOC_DAPM_HP(wname, wevent) \
    { .id = snd_soc_dapm_hp, .name = wname, .kcontrols = NULL, \
    - .num_kcontrols = 0, .event = wevent, \
    + .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
    .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}
    #define SND_SOC_DAPM_SPK(wname, wevent) \
    { .id = snd_soc_dapm_spk, .name = wname, .kcontrols = NULL, \
    - .num_kcontrols = 0, .event = wevent, \
    + .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
    .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}
    #define SND_SOC_DAPM_LINE(wname, wevent) \
    { .id = snd_soc_dapm_line, .name = wname, .kcontrols = NULL, \
    - .num_kcontrols = 0, .event = wevent, \
    + .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
    .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}

    /* path domain */
    @@ -129,11 +129,11 @@
    /* events that are pre and post DAPM */
    #define SND_SOC_DAPM_PRE(wname, wevent) \
    { .id = snd_soc_dapm_pre, .name = wname, .kcontrols = NULL, \
    - .num_kcontrols = 0, .event = wevent, \
    + .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
    .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD}
    #define SND_SOC_DAPM_POST(wname, wevent) \
    { .id = snd_soc_dapm_post, .name = wname, .kcontrols = NULL, \
    - .num_kcontrols = 0, .event = wevent, \
    + .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
    .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD}

    /* stream domain */



    \
     
     \ /
      Last update: 2011-04-13 18:29    [W:0.020 / U:33.832 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site