Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754010AbaKYMft (ORCPT ); Tue, 25 Nov 2014 07:35:49 -0500 Received: from smtp5-g21.free.fr ([212.27.42.5]:31468 "EHLO smtp5-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753635AbaKYMfr (ORCPT ); Tue, 25 Nov 2014 07:35:47 -0500 X-Mailbox-Line: From f093539970f62dbf319a7f7fee6360e05c32a1de Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: Jean-Francois Moine Date: Tue, 25 Nov 2014 13:33:17 +0100 Subject: [PATCH v5 4/4] ASoC: simple-card: Remove useless check To: Liam Girdwood , Mark Brown Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The CPU and CODEC names are checked when getting the DAI names. There is no need to check them once more. Signed-off-by: Jean-Francois Moine --- sound/soc/generic/simple-card.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 61f9500..c1ba78b 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -319,11 +319,6 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, if (ret < 0) goto dai_link_of_err; - if (!dai_link->cpu_dai_name || !dai_link->codec_dai_name) { - ret = -EINVAL; - goto dai_link_of_err; - } - /* Simple Card assumes platform == cpu */ dai_link->platform_of_node = dai_link->cpu_of_node; -- 2.1.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/