Commit 91d8560c authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul
Browse files

dmaengine: Unify checks in dma_request_chan() 



Use dev_fwnode() to simplify the check logic for Device Tree and ACPI
in dma_request_chan().

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20250205145757.889247-5-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 1722fb4a

drivers/dma/dmaengine.c

+6 −6
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ 
#include <linux/dmaengine.h>

#include <linux/hardirq.h>

#include <linux/spinlock.h>

#include <linux/of.h>

#include <linux/property.h>

#include <linux/percpu.h>

#include <linux/rcupdate.h>

#include <linux/mutex.h>
@@ -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)