From: Nicolin Chen Date: Thu, 24 Apr 2014 11:13:58 +0000 (+0800) Subject: ASoC: simple-card: Drop node->name checking X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=50e6c718a1eb2ae6d05f22615d8268b026175a4a;p=linux-beck.git 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 Signed-off-by: Mark Brown --- 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);