diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2025-02-05 16:57:12 +0200 |
|---|---|---|
| committer |   Vinod Koul <vkoul@kernel.org> | 2025-02-10 16:28:53 +0530 |
| commit | 91d8560c15918c7d44e4f665fac829ba8057a2f3 (patch) | |
| tree | 69beb02d75cb1c26ce2a3b35b1fd8d8a4aca711f /drivers | |
| parent | dmaengine: Add a comment on why it's okay when kasprintf() fails (diff) | |
| download | wireguard-linux-91d8560c15918c7d44e4f665fac829ba8057a2f3.tar.xz wireguard-linux-91d8560c15918c7d44e4f665fac829ba8057a2f3.zip | |
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20250205145757.889247-5-andriy.shevchenko@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/dmaengine.c | 12 |
1 files 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 <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) |