Commit c48de45d authored by Rob Herring's avatar Rob Herring Committed by Vinod Koul
Browse files

dmaengine: Drop unnecessary of_match_device() calls 



If probe is reached, we've already matched the device and in the case of
DT matching, the struct device_node pointer will be set. Therefore, there
is no need to call of_match_device() in probe.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20231006213835.332848-1-robh@kernel.org


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

drivers/dma/k3dma.c

+10 −15
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/of_device.h>

#include <linux/of.h>

#include <linux/clk.h>

#include <linux/of_dma.h>
@@ -839,7 +838,6 @@ static int k3_dma_probe(struct platform_device *op) 
{

	const struct k3dma_soc_data *soc_data;

	struct k3_dma_dev *d;

	const struct of_device_id *of_id;

	int i, ret, irq = 0;



	d = devm_kzalloc(&op->dev, sizeof(*d), GFP_KERNEL);
@@ -854,8 +852,6 @@ static int k3_dma_probe(struct platform_device *op) 
	if (IS_ERR(d->base))

		return PTR_ERR(d->base);



	of_id = of_match_device(k3_pdma_dt_ids, &op->dev);

	if (of_id) {

	of_property_read_u32((&op->dev)->of_node,

			"dma-channels", &d->dma_channels);

	of_property_read_u32((&op->dev)->of_node,
@@ -867,7 +863,6 @@ static int k3_dma_probe(struct platform_device *op) 
			 "dma-channel-mask doesn't exist, considering all as available.\n");

		d->dma_channel_mask = (u32)~0UL;

	}

	}



	if (!(soc_data->flags & K3_FLAG_NOCLK)) {

		d->clk = devm_clk_get(&op->dev, NULL);

drivers/dma/mmp_pdma.c

+1 −4
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/device.h>

#include <linux/platform_data/mmp_dma.h>

#include <linux/dmapool.h>

#include <linux/of_device.h>

#include <linux/of_dma.h>

#include <linux/of.h>
@@ -1019,7 +1018,6 @@ static struct dma_chan *mmp_pdma_dma_xlate(struct of_phandle_args *dma_spec, 
static int mmp_pdma_probe(struct platform_device *op)

{

	struct mmp_pdma_device *pdev;

	const struct of_device_id *of_id;

	struct mmp_dma_platdata *pdata = dev_get_platdata(&op->dev);

	int i, ret, irq = 0;

	int dma_channels = 0, irq_num = 0;
@@ -1039,8 +1037,7 @@ static int mmp_pdma_probe(struct platform_device *op) 
	if (IS_ERR(pdev->base))

		return PTR_ERR(pdev->base);



	of_id = of_match_device(mmp_pdma_dt_ids, pdev->dev);

	if (of_id) {

	if (pdev->dev->of_node) {

		/* Parse new and deprecated dma-channels properties */

		if (of_property_read_u32(pdev->dev->of_node, "dma-channels",

					 &dma_channels))

drivers/dma/pxa_dma.c

+2 −5
Original line number Diff line number Diff line
@@ -15,9 +15,8 @@ 
#include <linux/device.h>

#include <linux/platform_data/mmp_dma.h>

#include <linux/dmapool.h>

#include <linux/of_device.h>

#include <linux/of_dma.h>

#include <linux/of.h>

#include <linux/of_dma.h>

#include <linux/wait.h>

#include <linux/dma/pxa-dma.h>
@@ -1344,7 +1343,6 @@ static int pxad_init_dmadev(struct platform_device *op, 
static int pxad_probe(struct platform_device *op)

{

	struct pxad_device *pdev;

	const struct of_device_id *of_id;

	const struct dma_slave_map *slave_map = NULL;

	struct mmp_dma_platdata *pdata = dev_get_platdata(&op->dev);

	int ret, dma_channels = 0, nb_requestors = 0, slave_map_cnt = 0;
@@ -1362,8 +1360,7 @@ static int pxad_probe(struct platform_device *op) 
	if (IS_ERR(pdev->base))

		return PTR_ERR(pdev->base);



	of_id = of_match_device(pxad_dt_ids, &op->dev);

	if (of_id) {

	if (op->dev.of_node) {

		/* Parse new and deprecated dma-channels properties */

		if (of_property_read_u32(op->dev.of_node, "dma-channels",

					 &dma_channels))

drivers/dma/stm32-dma.c

+0 −8
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/list.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_dma.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>
@@ -1561,17 +1560,10 @@ static int stm32_dma_probe(struct platform_device *pdev) 
	struct stm32_dma_chan *chan;

	struct stm32_dma_device *dmadev;

	struct dma_device *dd;

	const struct of_device_id *match;

	struct resource *res;

	struct reset_control *rst;

	int i, ret;



	match = of_match_device(stm32_dma_of_match, &pdev->dev);

	if (!match) {

		dev_err(&pdev->dev, "Error: No device match found\n");

		return -ENODEV;

	}



	dmadev = devm_kzalloc(&pdev->dev, sizeof(*dmadev), GFP_KERNEL);

	if (!dmadev)

		return -ENOMEM;