Received: by 2002:ac0:950c:0:0:0:0:0 with SMTP id f12csp3095545imc; Wed, 13 Mar 2019 08:43:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqwQHgqKKyJvsoRZk7yLAQ/lY5iyBPF55m6ASmFIbw/UJp+TjhkUgDxD3pjt3JOzeM0+Sjj5 X-Received: by 2002:a62:1851:: with SMTP id 78mr45465858pfy.206.1552491800586; Wed, 13 Mar 2019 08:43:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552491800; cv=none; d=google.com; s=arc-20160816; b=u6Fme3WjSuK01VKH4LTXSbJaOkGF1ug89tGP4CZ9phNQyn6TJq/1H6ozNBlrCJ59lA PX4b5+gC/JkagRBhi1YbR4f4FcjECy7D8t+etMEoleNJ7x/VZVq2DORkYWTgBxSrI47p nTJZkWdjBo+b0jw9DJhcA46c+eD4YtWX1RS6ONeJw/lbiYBp0Nazi0a50lYnTcwFLg+U BhwE4ngv1VUZXFwOJ5i6GNmIPWal9Uj/eBvQr1VeOfYqixe8HogrS3sVynotPV5CLQUg ZHM3Dfj85dZW/rfW//fgOOunTYga3qVOz5Goh1u/cX2g6WX0v0/dt2H3LdBws69pFLsd Y+GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:message-id:in-reply-to:subject:cc:to :from:dkim-signature; bh=BMelY5BHaMGtrKjDHAbn5iQmGhdPaeBVqHghbF2/TMU=; b=cFqtUGZMXi1iTUq0uapZc1h+N6E03a/ftGsEfqG0u0Y0hubFns8+mjBfd7DCvvEoCH 91RsDuE8ATZk6lKTtXhuuJ93nXsb7/L4rg5k3NZvm68NQjUNKi4QgdbWdGLxhVpNe9Yb cz9q0EIeRUwry42NE0uPKNW8DTk4UDd3HCDlFj+kICd6NFmL+6WkDvdPsZjb98PwmRew RnN+2DctCb9p9t7Wh+pBIgNpvIWoE2jTVA96gy4q6Bxba1a/7SU1ecHWp7WWfOn7QQXU WgDaeTXO918h6nN5Obr6m70dKgQxFWBq0UFJcSeFSx4uWAB18tjH4PhbFuTAcV2/eu7V nHGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=thYx6liZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p22si10502656pfd.241.2019.03.13.08.43.05; Wed, 13 Mar 2019 08:43:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=thYx6liZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726797AbfCMPjD (ORCPT + 99 others); Wed, 13 Mar 2019 11:39:03 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:49538 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726635AbfCMPi7 (ORCPT ); Wed, 13 Mar 2019 11:38:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=BMelY5BHaMGtrKjDHAbn5iQmGhdPaeBVqHghbF2/TMU=; b=thYx6liZHxMK kGDMp1RSAC6CypBvPxYEhwHnlYxLw0JAEBEzt6ueGMJVC+cSkpEMT4e864IE9yMzzvOkg5I0eqReF HpVuc6BT8Ffj77btdysQ+7ULj9qcJQ5GRLApaVEJKbRVOmaVcXNVRbEni4dGbkuF/qWqfNie+Vgai OnGW4=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1h45xu-0003Qf-RN; Wed, 13 Mar 2019 15:38:46 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 61BD01128B98; Wed, 13 Mar 2019 15:38:46 +0000 (GMT) From: Mark Brown To: Olivier Moysan Cc: Mark Brown , lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, mcoquelin.stm32@gmail.com, alexandre.torgue@st.com, alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, linux-kernel@vger.kernel.org, olivier.moysan@st.com, arnaud.pouliquen@st.com, benjamin.gaignard@st.com, alsa-devel@alsa-project.org Subject: Applied "ASoC: stm32: i2s: use default dai name" to the asoc tree In-Reply-To: <1552317990-24219-4-git-send-email-olivier.moysan@st.com> X-Patchwork-Hint: ignore Message-Id: <20190313153846.61BD01128B98@debutante.sirena.org.uk> Date: Wed, 13 Mar 2019 15:38:46 +0000 (GMT) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The patch ASoC: stm32: i2s: use default dai name has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From fef050c88ce1cbec1ab9a0d981b5331a5ba40f15 Mon Sep 17 00:00:00 2001 From: Olivier Moysan Date: Mon, 11 Mar 2019 16:26:30 +0100 Subject: [PATCH] ASoC: stm32: i2s: use default dai name Use default DAI name based on dev_name function. Signed-off-by: Olivier Moysan Signed-off-by: Mark Brown --- sound/soc/stm/stm32_i2s.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c index 06bbbef74b3a..c18e068c1a0d 100644 --- a/sound/soc/stm/stm32_i2s.c +++ b/sound/soc/stm/stm32_i2s.c @@ -179,7 +179,6 @@ enum i2s_datlen { I2S_I2SMOD_DATLEN_32, }; -#define STM32_I2S_DAI_NAME_SIZE 20 #define STM32_I2S_FIFO_SIZE 16 #define STM32_I2S_IS_MASTER(x) ((x)->ms_flg == I2S_MS_MASTER) @@ -202,7 +201,6 @@ enum i2s_datlen { * @phys_addr: I2S registers physical base address * @lock_fd: lock to manage race conditions in full duplex mode * @irq_lock: prevent race condition with IRQ - * @dais_name: DAI name * @mclk_rate: master clock frequency (Hz) * @fmt: DAI protocol * @refcount: keep count of opened streams on I2S @@ -224,7 +222,6 @@ struct stm32_i2s_data { dma_addr_t phys_addr; spinlock_t lock_fd; /* Manage race conditions for full duplex */ spinlock_t irq_lock; /* used to prevent race condition with IRQ */ - char dais_name[STM32_I2S_DAI_NAME_SIZE]; unsigned int mclk_rate; unsigned int fmt; int refcount; @@ -771,12 +768,8 @@ static int stm32_i2s_dais_init(struct platform_device *pdev, if (!dai_ptr) return -ENOMEM; - snprintf(i2s->dais_name, STM32_I2S_DAI_NAME_SIZE, - "%s", dev_name(&pdev->dev)); - dai_ptr->probe = stm32_i2s_dai_probe; dai_ptr->ops = &stm32_i2s_pcm_dai_ops; - dai_ptr->name = i2s->dais_name; dai_ptr->id = 1; stm32_i2s_dai_init(&dai_ptr->playback, "playback"); stm32_i2s_dai_init(&dai_ptr->capture, "capture"); -- 2.20.1