lkml.org 
[lkml]   [2016]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/23] ASoC: soc-core: adjust for graph on snd_soc_of_parse_card_name
    Date
    From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

    It is assuming that the card related information is located on
    "card" node, but graph case doesn't have it.
    This patch adds node parameter to adjust for graph support

    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    ---
    include/sound/soc.h | 7 +++++--
    sound/soc/soc-core.c | 11 ++++++-----
    2 files changed, 11 insertions(+), 7 deletions(-)

    diff --git a/include/sound/soc.h b/include/sound/soc.h
    index 4f1c784..d100a33 100644
    --- a/include/sound/soc.h
    +++ b/include/sound/soc.h
    @@ -1642,8 +1642,11 @@ static inline struct snd_soc_platform *snd_soc_kcontrol_platform(
    int snd_soc_util_init(void);
    void snd_soc_util_exit(void);

    -int snd_soc_of_parse_card_name(struct snd_soc_card *card,
    - const char *propname);
    +#define snd_soc_of_parse_card_name(card, propname) \
    + snd_soc_of_parse_card_name_from_node(card, NULL, propname)
    +int snd_soc_of_parse_card_name_from_node(struct snd_soc_card *card,
    + struct device_node *np,
    + const char *propname);
    int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card,
    const char *propname);
    int snd_soc_of_parse_tdm_slot(struct device_node *np,
    diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
    index c0bbcd9..088a158 100644
    --- a/sound/soc/soc-core.c
    +++ b/sound/soc/soc-core.c
    @@ -3424,10 +3424,10 @@ found:
    EXPORT_SYMBOL_GPL(snd_soc_unregister_codec);

    /* Retrieve a card's name from device tree */
    -int snd_soc_of_parse_card_name(struct snd_soc_card *card,
    - const char *propname)
    +int snd_soc_of_parse_card_name_from_node(struct snd_soc_card *card,
    + struct device_node *np,
    + const char *propname)
    {
    - struct device_node *np;
    int ret;

    if (!card->dev) {
    @@ -3435,7 +3435,8 @@ int snd_soc_of_parse_card_name(struct snd_soc_card *card,
    return -EINVAL;
    }

    - np = card->dev->of_node;
    + if (!np)
    + np = card->dev->of_node;

    ret = of_property_read_string_index(np, propname, 0, &card->name);
    /*
    @@ -3452,7 +3453,7 @@ int snd_soc_of_parse_card_name(struct snd_soc_card *card,

    return 0;
    }
    -EXPORT_SYMBOL_GPL(snd_soc_of_parse_card_name);
    +EXPORT_SYMBOL_GPL(snd_soc_of_parse_card_name_from_node);

    static const struct snd_soc_dapm_widget simple_widgets[] = {
    SND_SOC_DAPM_MIC("Microphone", NULL),
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-10-17 10:34    [W:4.090 / U:0.516 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site