From patchwork Mon Nov 15 08:53:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 519136 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp5344966imj; Mon, 15 Nov 2021 00:54:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5AbOW3hXZs+uiRGYx7gObYvi1XouXP1vQWT8RUPmQheKmuvA5acfIn0sRnL6nc5ZCiFO2 X-Received: by 2002:a65:530d:: with SMTP id m13mr23487587pgq.128.1636966496730; Mon, 15 Nov 2021 00:54:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636966496; cv=none; d=google.com; s=arc-20160816; b=HrFtWBNeTWa6uAGUHjXDO1tIU7vJpFNkjdTrQNT8QCc+6AxHN8/LD0xHFytnDEwsnW RaQ6bDz2Sb9WC3imKr6/o6H7nUtAe2tJmxIQhe3O6XK3BztcDul7aK2Psf0SQo7eZT/K E9DQh0GGRNcpafxrHBuey11bCPm4EB1atHdrGYTEgLKXmgH8RXd/Q8itAw9MajcxVzwr S8JaYiYlEc7pXhJ9o6AY1J1i6xYwcX1J2pTmUbYIJZRuvJrJgRk+1q1wujpsPdUd/a3Q kWsPlh/+Lug3rRzMw9lEd7dZLjl0GDO5M8YO2w6G1ZJy0EUi5aTK5ExT9ykp4BnWepNc nDSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to; bh=Zwv0PoVXp7+dtzQrtfPXiUiBi2HDy7bjWoxoSl9Jvyk=; b=o+Y0oDP1IaO5BnQLHQ5f6yaZH1n3upXVlViB+Nz06pmWId34dvQusyE4gCF0rts+gj UsajvtwF3cZgAEm8wF7tmmTEyH9EuPxVBlIFJeXE/9N962qgh6it0rAiOHR3TnjzNPAB 2bJxYHs96GxxSCdsPuF6DyrsiV5HF6JWIqm49Zm0dEWwCCZ+c8ZBf5/ooXSL3Yyk+Vf4 nrrtjXxQsymwnXCp5LstGHSUkREI6IxRMgrp6SbK84iJtSpiAgWJ4zezpQhyqihMU4qC npTD7MZK5x1r7lLMy+uPBpHAYdI1mvgKHlei5wJnu344LoDDRkZLAyVnOtywptlewoc/ uSGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=YpPwnQ+Z; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id p10si22778537pld.73.2021.11.15.00.54.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 00:54:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=YpPwnQ+Z; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1B0D36E92A; Mon, 15 Nov 2021 08:54:55 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5E5906E92A for ; Mon, 15 Nov 2021 08:54:53 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 1F29161BF5; Mon, 15 Nov 2021 08:54:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636966493; bh=wn57j1S+OVDPjchxqdayqaIicCxtINUEg6GRzjIlw5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YpPwnQ+ZywWiftbIGbvSME2DSkHoKYPFuU4+pHFPnVCL6fAFGd6mYmtgljVBSkmRJ pW1JZbsvnPgbWG3BIB1WxilpINGEKjCw9qhXl3qcYTQJs2ryMXJDzUYFTmV+bJ9clv 93VV93b94yY9B4TxZ7B7hXK8AU350k/nQ0LP+ecDwB1REeriP9jE3UDWkfZnuLaeVM cjhwo1GJ6NlZbpRmqItwSJjTxt9iFUH4XKy1kf5swVCl5yYiAgReOUL0BXKR3AN91G tnDG8UAkjd/mH7+NAsriu0rVVog9i3scmEbYwpdOQPUe3HixNhQXEB6g/mtLNh/erJ SzxSnZNolHWtg== From: Arnd Bergmann To: Vinod Koul Subject: [PATCH 01/11] ASoC: dai_dma: remove slave_id field Date: Mon, 15 Nov 2021 09:53:53 +0100 Message-Id: <20211115085403.360194-2-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20211115085403.360194-1-arnd@kernel.org> References: <20211115085403.360194-1-arnd@kernel.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, dri-devel@lists.freedesktop.org, Bjorn Andersson , linux-tegra@vger.kernel.org, Thierry Reding , linux-mtd@lists.infradead.org, Laurent Pinchart , linux-spi@vger.kernel.org, Robert Jarzmik , Chunyan Zhang , linux-staging@lists.linux.dev, Michal Simek , Jon Hunter , Andy Gross , bcm-kernel-feedback-list@broadcom.com, linux-serial@vger.kernel.org, Orson Zhai , Nicolas Saenz Julienne , Arnd Bergmann , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, dmaengine@vger.kernel.org, Mark Brown , linux-rpi-kernel@lists.infradead.org, Jaroslav Kysela , Andy Shevchenko , linux-arm-kernel@lists.infradead.org, Scott Branden , Hyun Kwon , Greg Kroah-Hartman , linux-mmc@vger.kernel.org, Takashi Iwai , linux-kernel@vger.kernel.org, Laxman Dewangan , Baolin Wang Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Arnd Bergmann This field is never set, and serves no purpose, so remove it. Signed-off-by: Arnd Bergmann --- include/sound/dmaengine_pcm.h | 2 -- sound/core/pcm_dmaengine.c | 5 ++--- sound/soc/tegra/tegra20_spdif.c | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h index 9144bd547851..7403870c28bd 100644 --- a/include/sound/dmaengine_pcm.h +++ b/include/sound/dmaengine_pcm.h @@ -58,7 +58,6 @@ struct dma_chan *snd_dmaengine_pcm_get_chan(struct snd_pcm_substream *substream) * @maxburst: Maximum number of words(note: words, as in units of the * src_addr_width member, not bytes) that can be send to or received from the * DAI in one burst. - * @slave_id: Slave requester id for the DMA channel. * @filter_data: Custom DMA channel filter data, this will usually be used when * requesting the DMA channel. * @chan_name: Custom channel name to use when requesting DMA channel. @@ -72,7 +71,6 @@ struct snd_dmaengine_dai_dma_data { dma_addr_t addr; enum dma_slave_buswidth addr_width; u32 maxburst; - unsigned int slave_id; void *filter_data; const char *chan_name; unsigned int fifo_size; diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c index af08bb4bf578..6762fb2083e1 100644 --- a/sound/core/pcm_dmaengine.c +++ b/sound/core/pcm_dmaengine.c @@ -91,8 +91,8 @@ EXPORT_SYMBOL_GPL(snd_hwparams_to_dma_slave_config); * @dma_data: DAI DMA data * @slave_config: DMA slave configuration * - * Initializes the {dst,src}_addr, {dst,src}_maxburst, {dst,src}_addr_width and - * slave_id fields of the DMA slave config from the same fields of the DAI DMA + * Initializes the {dst,src}_addr, {dst,src}_maxburst, {dst,src}_addr_width + * fields of the DMA slave config from the same fields of the DAI DMA * data struct. The src and dst fields will be initialized depending on the * direction of the substream. If the substream is a playback stream the dst * fields will be initialized, if it is a capture stream the src fields will be @@ -124,7 +124,6 @@ void snd_dmaengine_pcm_set_config_from_dai_data( slave_config->src_addr_width = dma_data->addr_width; } - slave_config->slave_id = dma_data->slave_id; slave_config->peripheral_config = dma_data->peripheral_config; slave_config->peripheral_size = dma_data->peripheral_size; } diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c index 9fdc82d58db3..1c3385da6f82 100644 --- a/sound/soc/tegra/tegra20_spdif.c +++ b/sound/soc/tegra/tegra20_spdif.c @@ -284,7 +284,6 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev) spdif->playback_dma_data.addr = mem->start + TEGRA20_SPDIF_DATA_OUT; spdif->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; spdif->playback_dma_data.maxburst = 4; - spdif->playback_dma_data.slave_id = dmareq->start; pm_runtime_enable(&pdev->dev);