From patchwork Wed Feb 5 14:57:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13961275 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 4B013C02194 for ; Wed, 5 Feb 2025 15:03:50 +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=F6z/JXAGt2FXgiGe8/akTm//4xUh6kUJF+WrzkEi6SM=; b=1Bm1WA+ZCOFfRlV0JsJMcYeYG7 zUW6xpCbqwSovXqyuKyixEgaI9fvtSxazWT9ufpTXenBzL2EI85vOSSorNvSSlXI65ildITbBNstD xRDMq1BDNQSl5WT00JlW/PEXN4CAw+XHk+zQzIFwUElp4G8C9rMc+qfHaKTfZMbBn2j7Ls+FKCHzT IthAUWT2VhHorE9HInYepwoFmQ+dB139FKlTDLfx3gfn+Hzv4Aah7ZClXgytCn7PU5f4wePtUg4aN eZILpmwkmMs8sO6LzFfX0Z1Li5blQWT3jg3JX5ZpK3VmbvGe1zREC84fYPMD7qd9a/aakPRYlDxsr jvHIbEMA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tfgwD-00000003gtk-3fvq; Wed, 05 Feb 2025 15:03:37 +0000 Received: from mgamail.intel.com ([198.175.65.21]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tfgqt-00000003g7D-3LaB for linux-arm-kernel@lists.infradead.org; Wed, 05 Feb 2025 14:58:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738767488; x=1770303488; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uvnNcC/P2j4xylOfl/Tcg9K+1wXoPmdsdMK/xVegdEE=; b=kNBcJolPBfewbDDOECnC/GQ6XBdk0uyBFeTyIQKo8pKFzBPXCsof5DPp Tn+MlKke1KBR3Xziov0nJlunC4HEZpOnsUSJx+SMDkSJi/e/uNmzidZd/ HWXQn0VAJtXetzXWLsYFLWQxzPkix9DXL4DvlbE1nSzAabWpolEMR2zda MaRH7dinwE3RXsw9vCLB8IQxdMqHfffF7i1mWmocaLpGh7nu0wQG/XwEg fJq5XHPq+tRFDpn43KKcrLTByQU51MEtKFFw9iCxPxvgPp62mXzE6AXey pHUDoU5bf0qm/62MynYAQd2u90qedkOP0vcNKcxCnorjg1BISFuMR4as2 Q==; X-CSE-ConnectionGUID: QHf6D5U0QtiIdhz9i98t8Q== X-CSE-MsgGUID: RrbOEji5RuGtCfCUx8WUmA== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="39232349" X-IronPort-AV: E=Sophos;i="6.13,261,1732608000"; d="scan'208";a="39232349" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Feb 2025 06:58:04 -0800 X-CSE-ConnectionGUID: ve7rhMT8RhOcIscPbAcCeQ== X-CSE-MsgGUID: 4IezkWDmRTGdOzeqUX5fIw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="111806976" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa008.jf.intel.com with ESMTP; 05 Feb 2025 06:58:00 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id AE98D10A; Wed, 05 Feb 2025 16:57:58 +0200 (EET) From: Andy Shevchenko To: Vinod Koul , Amelie Delaunay , Frank Li , Paul Cercueil , Randy Dunlap , 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 v3 1/4] dmaengine: Replace dma_request_slave_channel() by dma_request_chan() Date: Wed, 5 Feb 2025 16:57:09 +0200 Message-ID: <20250205145757.889247-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1336.g36b5255a03ac In-Reply-To: <20250205145757.889247-1-andriy.shevchenko@linux.intel.com> References: <20250205145757.889247-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-20250205_065807_876377_0403C279 X-CRM114-Status: GOOD ( 12.30 ) 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 3449006cd14b..02a85d6f1bea 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 346251bf1026..83cbf7197a76 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -1639,8 +1639,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) From patchwork Wed Feb 5 14:57:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13961268 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 BE7E3C02192 for ; Wed, 5 Feb 2025 14:59:42 +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=FIP9wHwt0Gj4u3KzxmU501MJprDFFyxmCGVXsa0hrFE=; b=rCpYCsSGEx9Vpx6y9qYLQ/On56 uOY3vXzG0g5pvhZkaNJOe4JaybVJEL9/XPlcS3JLwJBcxBC/OHmG/9Al6l4PEpE9/1Dxd2AF4QOG8 0+sE3uEPJDinbE6Z1G1mpGcm+pNC+e04fqLA3MCn6Qj8cMdIIz60Ymt7u+LuK5DU83xW/3rEwPZx8 PODqOWXYVV2eFA3eYmKT3HMu4edyTY38EaAiNFfdk3kYmIKCTffaypFxaqsD8yXo7KZskXJy369bH QfJTLYYoohOTArwNJDl3AgTXtptUpL8rvx0WlfrMAnk29nN6C/tl+yx73KCtIzAzBB+7EloV51nYZ Y7v3EuNg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tfgsD-00000003gIc-11Fs; Wed, 05 Feb 2025 14:59:29 +0000 Received: from mgamail.intel.com ([192.198.163.14]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tfgqp-00000003g62-1tRl for linux-arm-kernel@lists.infradead.org; Wed, 05 Feb 2025 14:58:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738767483; x=1770303483; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3EDPzq+QRjtF8ntIcn0E9PwMJhWnjlNrTN7MIeR80jo=; b=DVIpvhbdr3MW7PfK2OQac0w/T/qBI2z2AjBkXlDONxLx9hw7Dj+GVUnv 2ytElc0fTiBJuxuUF45ubQ2xkLaSYqSXfl+Ci2wn7V/K50lRndDbkRgeB 7wBQgwzqa1US1izKjcZrhnazl8S8XKcaT+n+4kXYAB3Fh4qIf5cqVFpW2 s5IF1uuSyyYGNnGx3ddlyYySr7ja/LCf6febK4xgL4Cv1+Tp4jmu+ff1y AVLbh7xvZqojkjRoU5Oe+mUPzPqoTYUkzLGFxxausL6ZvDd0YSRNhSG/u IGpmEdgfsZdvHyajPzWsSgjjzOUCCvxoBQ4kueOgVkWqjevOEf6MRngvx A==; X-CSE-ConnectionGUID: UEgTHoxwSu6TOl9TqFR2DQ== X-CSE-MsgGUID: /kp42QWZRsS8zkC4Lvfy3g== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="39599700" X-IronPort-AV: E=Sophos;i="6.13,261,1732608000"; d="scan'208";a="39599700" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Feb 2025 06:58:03 -0800 X-CSE-ConnectionGUID: LMxD6/3vSq6Xcb2+iczw9g== X-CSE-MsgGUID: TDg2oATYSdCw/H5cHCpDSA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,261,1732608000"; d="scan'208";a="115968400" Received: from black.fi.intel.com ([10.237.72.28]) by fmviesa004.fm.intel.com with ESMTP; 05 Feb 2025 06:58:00 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id B93DE13E; Wed, 05 Feb 2025 16:57:58 +0200 (EET) From: Andy Shevchenko To: Vinod Koul , Amelie Delaunay , Frank Li , Paul Cercueil , Randy Dunlap , 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 v3 2/4] dmaengine: Use dma_request_channel() instead of __dma_request_channel() Date: Wed, 5 Feb 2025 16:57:10 +0200 Message-ID: <20250205145757.889247-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1336.g36b5255a03ac In-Reply-To: <20250205145757.889247-1-andriy.shevchenko@linux.intel.com> References: <20250205145757.889247-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-20250205_065803_497312_66F41A52 X-CRM114-Status: UNSURE ( 9.87 ) X-CRM114-Notice: Please train this message. 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 Reduce use of internal __dma_request_channel() function in public dmaengine.h. Signed-off-by: Andy Shevchenko --- include/linux/dmaengine.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 83cbf7197a76..a360e0330436 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -1646,7 +1646,7 @@ static inline struct dma_chan if (!fn || !fn_param) return NULL; - return __dma_request_channel(&mask, fn, fn_param, NULL); + return dma_request_channel(mask, fn, fn_param); } static inline char * From patchwork Wed Feb 5 14:57:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13961277 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 BA485C02192 for ; Wed, 5 Feb 2025 15:05:14 +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=rPo7yuMQUseeUfF5xw8F+I5twxmXEKkNF8gXD40MNsk=; b=k2gWX9efwhPVfhX/pbPJL2aJxP iHbeYYPgRPQ1NZtMiHQLspSKC6jSB28HNs4XYhpt+TNGq5gm6cmXh2wFhVZSZn1QD3Z6NLda4b10K YNgMUjOig4HiJhAdtJPPpKV8lGj6z40Z/1cbQTVhnuH1Sv4qeanPatKZdbFzLxLxYYbjViKlxHbUP HpXZgdLXvBlbUQ3OvSjpqOtyhUVaMGj4Oh/8Q/XY3oC10rVAQYwI2UyZXrzy48qvt9cin+gZsYXO8 OSKXrWUcCsgUlsMY8VV2RAfyR1OzlUxmrBGTYfshuBsex+GyCaCjr0LqiLidpPieXcgUFaPboDfCL srqA5ciQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tfgxY-00000003h6I-3LJO; Wed, 05 Feb 2025 15:05:01 +0000 Received: from mgamail.intel.com ([198.175.65.21]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tfgqt-00000003g7p-42Yi for linux-arm-kernel@lists.infradead.org; Wed, 05 Feb 2025 14:58:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738767488; x=1770303488; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=M41KJpPTgtZC1kvfB0ok8XtGl6qr+rtNSYSFho5CTIc=; b=kk6Pckv6b3RqAkWvwZ6m1bhjBY65OCQIXDkhumiC4L9FZRuUVpFr0dBu sjrCA8j9LvtJdugxjZeb9q/Ewp8Hr1JH2vBCF2KB2uO77U+QjvXxx1LYQ xIh8hQQHesMZaKH54n0YrGAJOah0ryPumwFCisGjvSMiy+6TR9+bZsS4H PemQtn6kzehwFACz11ib5TzVZzcfLpz4hnUqC0n4PwCv/UObJeo9lOxiQ mm3utZVMCVvbe7MI1c3+rKSPjohdjEoWxNLjtblUNTSydczV7ZbelTno9 X14z8NWWVl891k0O9yWXzcn1cMc0bJ7tnR6IoejAGZMbNzDU8WAh+eOK2 Q==; X-CSE-ConnectionGUID: zQ66mwbbQriU/UBaUiTqzQ== X-CSE-MsgGUID: 6i2s/OaGTea6QRKufeI4KQ== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="39232359" X-IronPort-AV: E=Sophos;i="6.13,261,1732608000"; d="scan'208";a="39232359" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Feb 2025 06:58:04 -0800 X-CSE-ConnectionGUID: +/C1jtaVQV+6by6EwWF+9w== X-CSE-MsgGUID: hG1snVx5SUO/cR2QZ8CmNw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="111806975" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa008.jf.intel.com with ESMTP; 05 Feb 2025 06:58:00 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id C7EE5164; Wed, 05 Feb 2025 16:57:58 +0200 (EET) From: Andy Shevchenko To: Vinod Koul , Amelie Delaunay , Frank Li , Paul Cercueil , Randy Dunlap , 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 v3 3/4] dmaengine: Add a comment on why it's okay when kasprintf() fails Date: Wed, 5 Feb 2025 16:57:11 +0200 Message-ID: <20250205145757.889247-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1336.g36b5255a03ac In-Reply-To: <20250205145757.889247-1-andriy.shevchenko@linux.intel.com> References: <20250205145757.889247-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-20250205_065808_047461_2F25F529 X-CRM114-Status: GOOD ( 10.54 ) 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 Add a comment in dma_request_chan() to clarify kasprintf() missing return value check and it is correct functionality. Signed-off-by: Andy Shevchenko --- drivers/dma/dmaengine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index c1357d7f3dc6..dd4224d90f07 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -854,8 +854,8 @@ struct dma_chan *dma_request_chan(struct device *dev, const char *name) found: #ifdef CONFIG_DEBUG_FS - chan->dbg_client_name = kasprintf(GFP_KERNEL, "%s:%s", dev_name(dev), - name); + chan->dbg_client_name = kasprintf(GFP_KERNEL, "%s:%s", dev_name(dev), name); + /* No functional issue if it fails, users are supposed to test before use */ #endif chan->name = kasprintf(GFP_KERNEL, "dma:%s", name); From patchwork Wed Feb 5 14:57:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13961274 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 30428C02192 for ; Wed, 5 Feb 2025 15:01:04 +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=rjrvvQmo/fKDtVMvtCDb2bRjs6bfmJhMEvD/yxRPZ2U=; b=LO4g2Ow3ldt0caHverPbErYX+q jpPgZewU7QqTFj9b8+Bd++P6BwecSyslCE1jLCPX44XFOl1ocbX04BNB7gq2Peyr0rlmo5hIjPSeC LgmCR6uEVtTUf4SJTNL4HrROLA7InQUT7nALKYNmXuKQiCRMqz9FdXzZiY0kUylj3Oh9mW7KNL259 pBvFIy64VXL+w/pnO3d4gLekY5dlPdvz7cghAR/azSMyk+yadD82khHUUjFoMVV8b0ezut9RAepmx y90CEE7spfLUu2ZTIurtR4QQUqfHBdukEigFiDj7Qx+Avl8XIqSOT7l+QQh/2dYn+DQKQrCtNFbb4 ObK+hQlQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tfgtY-00000003gVB-0Fc3; Wed, 05 Feb 2025 15:00:52 +0000 Received: from mgamail.intel.com ([192.198.163.14]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tfgqq-00000003g62-2mig for linux-arm-kernel@lists.infradead.org; Wed, 05 Feb 2025 14:58:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738767485; x=1770303485; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LWWSgceP4b2NC/0ZlJaLRWZ5tS4LiVtbK0mjSJfEAow=; b=T2CsNcXjRU0nRa5ClclabJqdPR8wBo3cVe48UP8ltAA7GVfLkyCPZWFL kVeh8z/R0Zkggz7n0K9uAk/ku0gWQmPB+WPzkMOxRrBoB03e3jpPj9IAT k9w36QBB7enFo0N7MclvRRfNcVjK0nMjO3Pp1cgBYRr2hUfMd9fEaWD8/ aKgH7zW1j1SXaba0/iYQ22gn16RRp0UXGzGiq9suSksvmwnhjtYn/U37d U7F3fGCW5BMCoDUA1xj3fnOVzJpvG0vFcFD11a5assaSlxlCg4I7eXVfy uoxB5lAF8VwZCAyQa4dDyuRBG8OmvAgsk7qYOsXIEvPhTXi3SlBNFlsmM Q==; X-CSE-ConnectionGUID: Z44wamFaTX+87x5RAg6KcQ== X-CSE-MsgGUID: CI0TwyCMSW+6uKWx1+8U3Q== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="39599710" X-IronPort-AV: E=Sophos;i="6.13,261,1732608000"; d="scan'208";a="39599710" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Feb 2025 06:58:03 -0800 X-CSE-ConnectionGUID: K6nc5QcQSXiYTt2XdJuX+A== X-CSE-MsgGUID: TxFOuydCRDyH9A6DioS8jA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,261,1732608000"; d="scan'208";a="115968401" Received: from black.fi.intel.com ([10.237.72.28]) by fmviesa004.fm.intel.com with ESMTP; 05 Feb 2025 06:58:01 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id CD62914E; Wed, 05 Feb 2025 16:57:58 +0200 (EET) From: Andy Shevchenko To: Vinod Koul , Amelie Delaunay , Frank Li , Paul Cercueil , Randy Dunlap , 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 v3 4/4] dmaengine: Unify checks in dma_request_chan() Date: Wed, 5 Feb 2025 16:57:12 +0200 Message-ID: <20250205145757.889247-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1336.g36b5255a03ac In-Reply-To: <20250205145757.889247-1-andriy.shevchenko@linux.intel.com> References: <20250205145757.889247-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-20250205_065804_709157_E2B06B41 X-CRM114-Status: GOOD ( 12.72 ) 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 Use dev_fwnode() to simplify the check logic for Device Tree and ACPI in dma_request_chan(). Signed-off-by: Andy Shevchenko --- drivers/dma/dmaengine.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index dd4224d90f07..758fcd0546d8 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -40,6 +40,8 @@ #include #include #include +#include +#include #include #include #include @@ -812,15 +814,13 @@ static const struct dma_slave_map *dma_filter_match(struct dma_device *device, */ struct dma_chan *dma_request_chan(struct device *dev, const char *name) { + struct fwnode_handle *fwnode = dev_fwnode(dev); struct dma_device *d, *_d; struct dma_chan *chan = NULL; - /* If device-tree is present get slave info from here */ - if (dev->of_node) - chan = of_dma_request_slave_channel(dev->of_node, name); - - /* If device was enumerated by ACPI get slave info from here */ - if (has_acpi_companion(dev) && !chan) + if (is_of_node(fwnode)) + chan = of_dma_request_slave_channel(to_of_node(fwnode), name); + else if (is_acpi_device_node(fwnode)) chan = acpi_dma_request_slave_chan_by_name(dev, name); if (PTR_ERR(chan) == -EPROBE_DEFER)