diff options
| author | Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-04-24 13:13:58 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-24 14:20:11 +0200 |
| commit | 50e6c718a1eb2ae6d05f22615d8268b026175a4a (patch) | |
| tree | 0f2de38ac29b3ba054a1dc5d1dc5cd0afb0fa3ec | |
| parent | ASoC: simple-card: Move dai-link level properties away from dai subnodes (diff) | |
| download | linux-50e6c718a1eb2ae6d05f22615d8268b026175a4a.tar.xz linux-50e6c718a1eb2ae6d05f22615d8268b026175a4a.zip | |
ASoC: simple-card: Drop node->name checking
The current simple-card driver limits the DT node name to "sound".
Any of other names is forbidden while actually we should allow DT
to pass other node names.
And if this function is being called, the node must already have
the compatible "simple-audio-card" in DTB. So there should be no
need to check the name here.
Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | sound/soc/generic/simple-card.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 3f2e5807d7eb..383a4a18d51f 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -156,8 +156,7 @@ static int simple_card_dai_link_of(struct device_node *node, char *prefix = ""; int ret; - if (!strcmp("sound", node->name)) - prefix = "simple-audio-card,"; + prefix = "simple-audio-card,"; daifmt = snd_soc_of_parse_daifmt(node, prefix, &bitclkmaster, &framemaster); |