From patchwork Tue Oct 8 17:27:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13826764 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 117EFCEFC38 for ; Tue, 8 Oct 2024 17:42:17 +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=tlR0dU4j8ub8DzPYg6DEQp1nqG cyuwMncqo4vQ3JR4JbsvftiPh4VTlb7skyyvsABcw+juEx/M7w8Ea96F9Jw2AMM1x9yv20fdwmi1Z aFJuOK+YKq4kiNKfSYYP9/yWDlaFtc3VcWVgEwMsGbE+CYJpP6okgEpJbmUkqRzibRQU9PnK4Ubsl tPv+bZFb8Jyoe+4pblAse8+WC15qaVmi6cQhNLIfAWRUUNh5zgpEYRnsBBjaP+Y6F5RQa7K3cNUFw l6TmS2QeshKf1zIYC6CU+MnONLY8ZCQFwgRhHtFCvTEnIJziJ9Z8Ms/UOqdlA2m2C1gu+PZepFL5L 9F24gLGg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1syEDm-00000006gFm-06QU; Tue, 08 Oct 2024 17:42:06 +0000 Received: from mgamail.intel.com ([192.198.163.17]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1syE6h-00000006erB-2xAZ for linux-arm-kernel@lists.infradead.org; Tue, 08 Oct 2024 17:34:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1728408887; x=1759944887; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LWWSgceP4b2NC/0ZlJaLRWZ5tS4LiVtbK0mjSJfEAow=; b=gadP+H/NjBdrfE3cf+22Px+0rg4Xfnc+hD5wwVAp3M86/ul4kTw1hDWb rukbHkeXfiS6Ekg2SWTsQdVhceUDtTIl1BdWSVzNBPzMQkkTbfQSRBY0F AS50+xG6mtNtvb5BNj/RcLLnms7TGeAbb/DuItuMwRPBiLyTQKj2k9qPh M+SvNskN2K5P/I1MWil5fM9PAZmhzWWOgUQ7QHPPNx88sKWOJFiLDPSli ql8ELOtqvTcXupNw+YzgrbjvTA8RPUgKzZdtmK092k1eD+uqcj/P/X935 ECceKmOpIIFWM2NprEokGaHGmwL8QUxZ9UPhJuKeSjUwX1cJzqHQXhVdt A==; X-CSE-ConnectionGUID: LRpyum8kQFKMfaV/Y71G0w== X-CSE-MsgGUID: bOGcQpJXR8m9n4ZXXM78zA== X-IronPort-AV: E=McAfee;i="6700,10204,11219"; a="27510143" X-IronPort-AV: E=Sophos;i="6.11,187,1725346800"; d="scan'208";a="27510143" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2024 10:34:11 -0700 X-CSE-ConnectionGUID: xy4Hx6riRemFUqYdFdVEjg== X-CSE-MsgGUID: cCAzOXxJStCN7+sdvRCcCQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,187,1725346800"; d="scan'208";a="106677525" Received: from black.fi.intel.com ([10.237.72.28]) by fmviesa001.fm.intel.com with ESMTP; 08 Oct 2024 10:34:08 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 19901430; Tue, 08 Oct 2024 20:34:07 +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 4/4] dmaengine: Unify checks in dma_request_chan() Date: Tue, 8 Oct 2024 20:27:47 +0300 Message-ID: <20241008173351.2246796-5-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_103447_833685_BBFD9385 X-CRM114-Status: GOOD ( 12.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 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)