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: 13961262 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9BABA1DDA0C; Wed, 5 Feb 2025 14:58:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738767487; cv=none; b=FcGupI68LWSKMW4jmVTsyuGFHGv0oJbpwWl4MMB7aKaMzempeba3toeMkAjH2+ea7PU+yVb0EOF5vvILlVwn4Q5eJU0F4IODovOvCijglTA1xjr7U0vZSbuGCM2erOQsYsn1/jaBIuNjkzBp+bibdfSSu817KR7S3x/7PzgpZqA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738767487; c=relaxed/simple; bh=uvnNcC/P2j4xylOfl/Tcg9K+1wXoPmdsdMK/xVegdEE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KM7pA/fpNVOzQSRCWwa5Zula/hsW/SPdzWwl9tn3scoBjUbCj6HUj7KkyYHokSQyVVFg5UYn34tHRNuE9loGN1JwrK40Cb+UstgnqK15zHxIO2G/kfu280sQOu7dq5xMYn3DkEf1QHjzeGoNzca/EpIBRiy2ITJYp/gQxf5AuC0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=hwdmDFsR; arc=none smtp.client-ip=198.175.65.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="hwdmDFsR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738767486; x=1770303486; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uvnNcC/P2j4xylOfl/Tcg9K+1wXoPmdsdMK/xVegdEE=; b=hwdmDFsRS98kpLMH5PtB6zrZP6pvjly0Yk2NRNRZNd4VwMhsRhK8wjbB loSckU5anpKMXgUZwa5VuK+pvf1HACRGbUTUu6Fno50zFhxzObZ4R1NLB RXHBeEqg88btOMYKSHQcCUOTY0HdlgOx/B2WX693aStg8+zGS7Y+JSflJ KrY/JTChJxlLk1vyd41PcD58TZGJBPu8asoesjUay6odgelMU4/A5UwO+ QQbTjuMYLufbZSliLFjIyl+kzhnyajTTAAYDl5BpvTjpM+epmyWP5Ep8X TZFf0PKDaPrkuYkg6qq94NSvoCOVkFRmaBwyEx7Eosj03lDxp72tzWpgm w==; X-CSE-ConnectionGUID: Ibip8meeT2mePsPrrGP1sA== X-CSE-MsgGUID: mszqPtG6QMe/mH6zlMOtUA== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="39232344" X-IronPort-AV: E=Sophos;i="6.13,261,1732608000"; d="scan'208";a="39232344" 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> Precedence: bulk X-Mailing-List: dmaengine@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: 13961258 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 790CF1547E9; Wed, 5 Feb 2025 14:58:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738767485; cv=none; b=A1EZDgGZRoQaHAe4XsiItMtxQ6R7mZAgpijk86CT+C4jkHfh8NceBU7VSf/kk3uZavv5DyIg54i8izXwwPXp9PO0byUdb114O1CmiBZw6VB1Dm/sOoN+EtPo2pN2bIy78ifhFy8ISVwBaK+0YhTMKUiBqE6epE5Zn/bRJUrAE6Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738767485; c=relaxed/simple; bh=3EDPzq+QRjtF8ntIcn0E9PwMJhWnjlNrTN7MIeR80jo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gEgontPymk0LYhuQV2ch1uBLoWbLUMT391kgo650+oFbokP9TWkLPeLOUEWzEUtRQjEv0jMT7b3oAWG1TGlIi6jfQLTpbAQPzs7bO6ZXhNRPfNPub6LmoxxdQTFEIoVAaySg3nPggPSm/AFikDY4Ussy/b0X7AT65ItsMtKPLQA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=fuDeX3Ty; arc=none smtp.client-ip=192.198.163.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="fuDeX3Ty" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738767484; x=1770303484; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3EDPzq+QRjtF8ntIcn0E9PwMJhWnjlNrTN7MIeR80jo=; b=fuDeX3TyaKrq78n0hv1djII8ph8BWdw1f2dbTM3vGGYVIGAn5rccS2vC 7C+nwvBz37e9h3v4Bj6Axqn6cQjOdOFR2BqdGULiaJ3S0/CbjJhX36ulU VeXRRN/n6qNkvR81laTzU7jTzlhD3q3wTPUynxup9do/GeCyQcIjEHnLs g8nIpef9B3P9q63yMAV1umGqBFkq8ulKokEadHq7Hk/3Mre7tdAPlmTt4 Al6W1FF76+c0ZAL70inXP53VEoUmObO267m2dHjUUgJnC/CO2PKqCyjAz +d9h2OeEU2QvlLwHMhx42LNMIXYP6nqkDEjQBMk4JZK3MzGvsowWTwM4R w==; X-CSE-ConnectionGUID: 3cyhpVFBSDiWB+4+HGAT+A== X-CSE-MsgGUID: G8fqZEFRQtWDYx9YTDj5KA== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="39599695" X-IronPort-AV: E=Sophos;i="6.13,261,1732608000"; d="scan'208";a="39599695" 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> Precedence: bulk X-Mailing-List: dmaengine@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: 13961261 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3909F18CBFB; Wed, 5 Feb 2025 14:58:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738767487; cv=none; b=OgH6zHHKdLa+E4TuMYsCyRnx+mK7RE2pffsNzuAJwDdZpMm2a0ZE8S9X9ltsHHsV8fiq0BfXPojcKlCeGJh//a1CblMaVC71+zKDcbmgrrR4HKAwLnQfK7LhlbkiyOXkZTzeru48QRRYR4Wwkc9vPfjNZqdwCCtkBukBeNTmvbA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738767487; c=relaxed/simple; bh=M41KJpPTgtZC1kvfB0ok8XtGl6qr+rtNSYSFho5CTIc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uE85Ww/CuDLGTvoN181s9ZQpnuw9Etz/GA3os2COpTOm9NvNlu3fNyYUf+HFTzbT2X+s07C2IPlNrkA6RueLKqllShlKhBsNS5hTjTy2MQ+wnPS4K7d9Qk6TUiZywNRjeOXzXVtR3EokT5B0qMI3O9XjWQPwpk4OAUmY+z+JcOo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=SJCZmW8c; arc=none smtp.client-ip=198.175.65.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="SJCZmW8c" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738767487; x=1770303487; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=M41KJpPTgtZC1kvfB0ok8XtGl6qr+rtNSYSFho5CTIc=; b=SJCZmW8c4/crNZmYDauA01NMD2Oc8jhgBZVjIP+JC9YP85FD3UgGXiuw HS72OUEfy+s74SZjYn4zUkZHzjDz3EjyrxMcrIHBTOMRd3uWgKb1WGX0C NukW9ES5ilgfRJSRvunmWWN6lqMGEHUBtTSXPM+0BxpKG09lYa2pBKc82 gu7k8Ym5a8mn53KSDKGUxNlj1PNs3dSEwwgX+yANWZfIynZbbuVrc4OhD mToG6xDeiy5r87xCZKHCMt3/tJnNINpsR6EDe14QTdIn9ejaZ3/c4gayH H9vHqmY2MF8I5e2nzgK7pfcghFR3ZHdY1rxBXb8H9/jcketw7J3v7D5Bf A==; X-CSE-ConnectionGUID: psi4DFEATBS46/F7Gixd8A== X-CSE-MsgGUID: Ke2N1bDcR8SFIaO8NFXT2Q== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="39232354" X-IronPort-AV: E=Sophos;i="6.13,261,1732608000"; d="scan'208";a="39232354" 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> Precedence: bulk X-Mailing-List: dmaengine@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: 13961260 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8A40D18C93C; Wed, 5 Feb 2025 14:58:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738767487; cv=none; b=NvN974CVJkMWCxbjI8y4J7fYINoROYuIlwApp00KOkrNQb9eK5gm2xhbRPANkEwGd0A+HE87nHys2bSKhtIAUJKfwnErqXdJfwnRzhBDR+l3vqJ/FhtaTL03uZ9cUvaKmpdHOK4qvDB2pYv9RnsqDc5XT/zpttiEPeHLrhE0FpA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738767487; c=relaxed/simple; bh=LWWSgceP4b2NC/0ZlJaLRWZ5tS4LiVtbK0mjSJfEAow=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GvX6+umBESP1p8palf6JzeO7iCiIyn+ZaCgU6iOdwfyuqcxMn7FMJyvs2lydY7/h6H1Qoz6izILQ0U1wYm7exUqd+Xl3YjHvblY90s8k5Mow60GyqKCnyx9m5bzmMnQCILj0QpnQDpcyjphh5ekn0jpG3K7Cztfkw9ZhsRtgjoI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=BAIS/m/r; arc=none smtp.client-ip=192.198.163.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="BAIS/m/r" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738767486; x=1770303486; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LWWSgceP4b2NC/0ZlJaLRWZ5tS4LiVtbK0mjSJfEAow=; b=BAIS/m/r2jG7ZMvbTewcq3o6ByGYFSImQeD8iYBKASgy2mAZp9IcNnRp I7JQfUA+O10koBCZQ33R3Sfr2nrnXLsW7d3PvzNIsXJ+ODkyUe9cI6NTW hAgN9+SpBdAZj0XuGLaHUGNVQn/+Z7NWAeMWcJ9idzlkdf+mVfRpxw0u4 MMncFM6Th0ppbpwt18Alk9nlJMVFh9gXdF0mdWdBuaXLENdncbVrzze26 u1y1n7M/kPVy677ngHgGDhRFRSKX72AOjzGhxkYfkeK6oyWuGKXwHjgpo OVqXQOeu56/HPv9tGx00ldNjZUxCR/UhHJeUn1GlE4RIQtqdKRoUtrJlY w==; X-CSE-ConnectionGUID: /+kZMUreRM6X33nKYcZ/Qg== X-CSE-MsgGUID: y1SR6VHTQSqtogm/mS47Dg== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="39599705" X-IronPort-AV: E=Sophos;i="6.13,261,1732608000"; d="scan'208";a="39599705" 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> Precedence: bulk X-Mailing-List: dmaengine@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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)