Received: by 2002:ac0:950c:0:0:0:0:0 with SMTP id f12csp3955579imc; Thu, 14 Mar 2019 08:59:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqwLSVSiJZiZLwSvWPDjOZqIjogs49/kpRhRgWc3HRF1jFZ+7SyHZCPi79JnRW/KqZeSn45V X-Received: by 2002:a63:fd10:: with SMTP id d16mr24455192pgh.306.1552579146988; Thu, 14 Mar 2019 08:59:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552579146; cv=none; d=google.com; s=arc-20160816; b=B0g/FFem2abQ8g9NHefaeZ+9/IviBqmi+sumny08vzNcAM759x6gcisLqUYTzVFCeW mmtIXN8udBUOWLviDELHiAQDNRDVEuvwadjrH286Y+I0a93Fx5pVKWZoBljVEDc6gWOA uWpu4o05Mv7IEFt5Buu+G7JE+Wxtu55cGARolORAEBQ7/zMQ+TS2LGi0cOC20VsmmWBY kgzltygNxrNHEI2shS1j0+k1YrTPjA4aBN3/FM++hqjZtyHPwMcnQEk9rluBEcOZGK7l c9oOEgPLY48i2ThhHI7gUw7YDFTBaqlAdjGfX7eUzKEwWFOUkmXZZFmqgbug47O0TuRU KF4Q== 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=LMpDV+9mGYIQ7inptsrEnEBenRl1iZyblj9dQjTvd4LD4p0y+3WII/LQti7Ckkh9G0 sTWFXiDh4qC8M0zECIibYRZnZ60QWQoyNV11U69Z4Wkrs0bRlE+bmpTlaVqpZwjigIax ZuzsJL2Y2cEpm3UlCdDy79cg97r9CP2hLlvHxQti6EAFE0EvePadWUcH40g864bB6FGJ 50e4VkfqMEKcXYcV9bXlEb0s7X24Q92R36dsJmWEZKm3I4vzT3cHUKQ/UnO3uM2dCZ7o 77c6tM0pyh5aj0Tf0UaUV8XVx4MbGh0FSZZtvpPTHzZo/p5RqGWaTERyGM4dmhglxSLw O7xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=Rzyv5zXI; 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 n3si13449065plk.108.2019.03.14.08.58.51; Thu, 14 Mar 2019 08:59:06 -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=Rzyv5zXI; 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 S1727897AbfCNP4f (ORCPT + 99 others); Thu, 14 Mar 2019 11:56:35 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:35172 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727268AbfCNPxz (ORCPT ); Thu, 14 Mar 2019 11:53:55 -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=Rzyv5zXIAqgi 4dOxel69WJF1s6AQwPI2weycxaj/ZMFeu2tL3/54rhq4aCfhX1QbXIOO5p+7OmND5t1FbHGmmuMLD f6EcPzwVzTOElX6rrO2eJfYtlsVpLzxWUZw8O1lpsBO1iGIa0K4hKh0FuRK1RyTP3WKDMh1JF4p6C MdZRo=; 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 1h4Sfr-0002gE-Cp; Thu, 14 Mar 2019 15:53:39 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id D6F9E1126E64; Thu, 14 Mar 2019 15:53:38 +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: <20190314155338.D6F9E1126E64@debutante.sirena.org.uk> Date: Thu, 14 Mar 2019 15:53:38 +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