From patchwork Mon Mar 10 02:37:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3801071 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A6D019F369 for ; Mon, 10 Mar 2014 02:38:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B448C2034E for ; Mon, 10 Mar 2014 02:38:22 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 3750B201F5 for ; Mon, 10 Mar 2014 02:38:21 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id D7116265633; Mon, 10 Mar 2014 03:38:19 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id F1867265617; Mon, 10 Mar 2014 03:38:06 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 4119126561E; Mon, 10 Mar 2014 03:38:06 +0100 (CET) Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by alsa0.perex.cz (Postfix) with ESMTP id 742BA265607 for ; Mon, 10 Mar 2014 03:37:58 +0100 (CET) Received: by mail-pa0-f42.google.com with SMTP id fb1so6640023pad.15 for ; Sun, 09 Mar 2014 19:37:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:message-id:from:subject:user-agent:to:cc:mime-version :content-type; bh=YB/lukiXFNCcbMQBfVClSbWZ/GrLKDHAtCqF9uxjT+8=; b=K2+//IjzhB/e/Q0Ws5s67ZtvH/DVsYjWVUX2z56rj92ukfycs+7FYtFkYAhGIOFbcN 29N9dQC6fwNMIYQCMovIQYu3znW51bRZCoumXBH8iJdS+BaLfuUqqgQFBjxctLFpYHdN yMbEDwyQtRQK5PGLq1AaOXWoi91gqnAi1Hwd13pITg/GcJab0JN6NtcKs51BqCxyVdB5 /JPOcXaDr90foRkEKaYOeNe048rbvSO/7NfB109YGUROetqh0jDsM1bRK2UMUt7MTauG +eIh/0yRIIBsI0YT+AtcY6lzaKia47zQ1xXRueSW0yPib7JxV1UbKYibiXpcec11uEWC xPng== X-Received: by 10.66.232.7 with SMTP id tk7mr36785432pac.94.1394419077249; Sun, 09 Mar 2014 19:37:57 -0700 (PDT) Received: from morimoto-Dell-XPS420.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id js7sm60277134pbc.35.2014.03.09.19.37.55 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 09 Mar 2014 19:37:56 -0700 (PDT) Date: Sun, 09 Mar 2014 19:37:56 -0700 (PDT) Message-ID: <87vbvmrd6m.wl%kuninori.morimoto.gx@gmail.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 To: Mark Brown MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Cc: Linux-ALSA , Simon , Liam Girdwood , Kuninori Morimoto , Kuninori Morimoto Subject: [alsa-devel] [PATCH] ASoC: simple-card: card name can be option X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto snd_card.name is now option on DT case. non-DT case can follow same style, and it is understandable from platform point of view. Signed-off-by: Kuninori Morimoto --- sound/soc/generic/simple-card.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 7cabcc5..5dd4769 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -287,7 +287,6 @@ static int asoc_simple_card_probe(struct platform_device *pdev) } if (!cinfo->name || - !cinfo->card || !cinfo->codec_dai.name || !cinfo->codec || !cinfo->platform || @@ -296,7 +295,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev) return -EINVAL; } - priv->snd_card.name = cinfo->card; + priv->snd_card.name = (cinfo->card) ? cinfo->card : cinfo->name; dai_link->name = cinfo->name; dai_link->stream_name = cinfo->name; dai_link->platform_name = cinfo->platform;