From patchwork Tue Oct 8 17:27:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13826765 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 97E3BCEFC38 for ; Tue, 8 Oct 2024 17:43:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=P2CvXVrRqmh4sFqPBb+q9K3gAiwFS2lNPnQAePsDizo=; b=ouFISB77oDo+VbSIOqrNu9SP94 xKZIpIJsYjjR0II/r3uo4XvOusaqClPbzSNLbEszINmeDXfFTflFHBvDo8c+sP4t7qbe4+ch91n9D 1o8yEfLVhRP/y84/hgI9B9BTAsZyw+5QqyqN+ZJUe61Ws/8y+GRq4q+NGQte/WMwo+Mlq+ClVKKu4 MyODzRTgcWQ+8XZozjq+PEbDSLR8mQi4qWoVn0ejdMbqT8BU24JrGvarvuyZCZBPZqZSNjwVpLj2h YjtWDBl7cOzp0Itg5O2UuZWtVFcoInnJ80VtkuUlbUvff5iE/lvhCbqwBTU8tpuxX/e7CStz2hjk5 BPBwA86g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1syEF3-00000006ghb-3XCG; Tue, 08 Oct 2024 17:43:25 +0000 Received: from mgamail.intel.com ([198.175.65.12]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1syE6A-00000006eh3-3mN1 for linux-arm-kernel@lists.infradead.org; Tue, 08 Oct 2024 17:34:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1728408855; x=1759944855; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GdFJbEH9FuHcHkDgW9w9j0RlEqZ4KkfewDrDe8HQ5S0=; b=Xaqloi96FstvSMdsWBT+4uXN2pFQgYGFwhurXDkKqKS7L6rii4pZvRG+ xDhZZrvPjBj86XlvWAJyajCQ4UHGMwwXXGefyUIh6qFbEsLjkghot5Vmk vPKjiQYXYsHIpViVW72xPNNl+yT6cEeQeW6I37RsZg5HbjDPJzo0201yv RpBSNoaufFIvnnYSskRInAS/E7TZka4FPz8vtAss5XEcC+IXyWVNeVByA DO0sqx8+GbJLuHYvFCfS9pSrRRsanXsZ9CkWm5Y94SW/NfRq0mgQQISJM 4RExDAyO5huXFUjQFvF7bvgwHFhZ0Vd8f4wxDEPMHXo0eMzE/GdEimATy Q==; X-CSE-ConnectionGUID: C7BttPLSTISa2Ig/6Ku8zA== X-CSE-MsgGUID: ZuV+SQMPQwG73sFiU9NK3Q== X-IronPort-AV: E=McAfee;i="6700,10204,11219"; a="39021971" X-IronPort-AV: E=Sophos;i="6.11,187,1725346800"; d="scan'208";a="39021971" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2024 10:34:10 -0700 X-CSE-ConnectionGUID: IPfCEXd2RD+i1AMSC6Ycqw== X-CSE-MsgGUID: wIGVkGbYSHWamGJJjY0pXQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,187,1725346800"; d="scan'208";a="99266644" Received: from black.fi.intel.com ([10.237.72.28]) by fmviesa002.fm.intel.com with ESMTP; 08 Oct 2024 10:34:06 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 806CE26B; Tue, 08 Oct 2024 20:34:05 +0300 (EEST) From: Andy Shevchenko To: Vinod Koul , Paul Cercueil , dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org Cc: Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Andy Shevchenko Subject: [PATCH v2 1/4] dmaengine: Replace dma_request_slave_channel() by dma_request_chan() Date: Tue, 8 Oct 2024 20:27:44 +0300 Message-ID: <20241008173351.2246796-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1336.g36b5255a03ac In-Reply-To: <20241008173351.2246796-1-andriy.shevchenko@linux.intel.com> References: <20241008173351.2246796-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241008_103415_000499_97C8C320 X-CRM114-Status: GOOD ( 12.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Replace dma_request_slave_channel() by dma_request_chan() as suggested since the former is deprecated. Signed-off-by: Andy Shevchenko --- drivers/dma/imx-sdma.c | 5 ++--- include/linux/dmaengine.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 72299a08af44..3a769934c984 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1459,9 +1459,8 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan) * dmatest, thus create 'struct imx_dma_data mem_data' for this case. * Please note in any other slave case, you have to setup chan->private * with 'struct imx_dma_data' in your own filter function if you want to - * request dma channel by dma_request_channel() rather than - * dma_request_slave_channel(). Othwise, 'MEMCPY in case?' will appear - * to warn you to correct your filter function. + * request DMA channel by dma_request_channel(), otherwise, 'MEMCPY in + * case?' will appear to warn you to correct your filter function. */ if (!data) { dev_dbg(sdmac->sdma->dev, "MEMCPY in case?\n"); diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index b137fdb56093..b4e6de892d34 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -1632,8 +1632,8 @@ static inline struct dma_chan { struct dma_chan *chan; - chan = dma_request_slave_channel(dev, name); - if (chan) + chan = dma_request_chan(dev, name); + if (!IS_ERR(chan)) return chan; if (!fn || !fn_param)