From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64B22C04AB6 for ; Fri, 31 May 2019 10:34:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 30B3A2678A for ; Fri, 31 May 2019 10:34:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559298895; bh=JZQhlN7ovZRJPnCCbDYdQTbN5iS8jI8VdNp1DLtC04c=; h=From:To:Cc:Subject:Date:List-ID:From; b=s1ENWkchkleIaKrrenxdBYeE6miuov4JdahhrrJJ6gWU/ta6sNYxnt49bE0bgIfFQ rU9Q98JNhllkEQcR2mfZiVhxohof/f9uWnhXrspe9EBGdlQthLgknvor3k99SqW696 TWkdL90cy+AaaHtWB6BSNf2Cy8qjkoe0fuDje9pc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727034AbfEaKey (ORCPT ); Fri, 31 May 2019 06:34:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:33252 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726002AbfEaKey (ORCPT ); Fri, 31 May 2019 06:34:54 -0400 Received: from PC-kkoz.proceq.com (unknown [213.160.61.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 01CA726788; Fri, 31 May 2019 10:34:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559298893; bh=JZQhlN7ovZRJPnCCbDYdQTbN5iS8jI8VdNp1DLtC04c=; h=From:To:Cc:Subject:Date:From; b=K9zZ4R5ONoRJhZC3wp3+NNnuUINZ6ztQSIRyMU06UyqLhDdGWMLUEi98ZZfQPpUeq dKJaGelsU47ZqD+f46Q+0XoJKefhQVoXNoHaRwZ+rTyOlEgE2ka28a4UJ60IVT5vFQ 2Wgn7b5pXIwFehVS8IavArbhifSWp9ROlteEnu88= From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Tzung-Bi Shih , Sylwester Nawrocki , Krzysztof Kozlowski Subject: [PATCH v2] Revert "ASoC: core: use component driver name as component name" Date: Fri, 31 May 2019 12:34:02 +0200 Message-Id: <1559298842-15059-1-git-send-email-krzk@kernel.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Using component driver as a name is not unique and it breaks audio in certain configurations, e.g. Hardkernel Odroid XU3 board where following components are registered: - "3830000.i2s" with driver name "snd_dmaengine_pcm" - "3830000.i2s-sec" with driver name "snd_dmaengine_pcm" - "3830000.i2s" with driver name "samsung-i2s" This reverts commit b19671d6caf1ac393681864d5d85dda9fa99a448. Signed-off-by: Krzysztof Kozlowski --- Changes since v1: 1. Fix driver name in commit msg. --- sound/soc/soc-core.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2d3520fca613..7abb017a83f3 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3113,10 +3113,7 @@ static int snd_soc_component_initialize(struct snd_soc_component *component, { struct snd_soc_dapm_context *dapm; - if (driver->name) - component->name = kstrdup(driver->name, GFP_KERNEL); - else - component->name = fmt_single_name(dev, &component->id); + component->name = fmt_single_name(dev, &component->id); if (!component->name) { dev_err(dev, "ASoC: Failed to allocate name\n"); return -ENOMEM; -- 2.7.4