Commit e59d81e9 authored by Linus Walleij's avatar Linus Walleij Committed by Vinod Koul

dmaengine: ste_dma40: Pass dev to OF function

The OF platform data population function only wants to
use struct device *dev, so pass that instead.

This change makes the compiler realize that the local
platform data variable is unused, so drop that too.
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230417-ux500-dma40-cleanup-v3-5-60bfa6785968@linaro.orgSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 42ae6f16
...@@ -3480,14 +3480,14 @@ static int __init d40_lcla_allocate(struct d40_base *base) ...@@ -3480,14 +3480,14 @@ static int __init d40_lcla_allocate(struct d40_base *base)
return ret; return ret;
} }
static int __init d40_of_probe(struct platform_device *pdev, static int __init d40_of_probe(struct device *dev,
struct device_node *np) struct device_node *np)
{ {
struct stedma40_platform_data *pdata; struct stedma40_platform_data *pdata;
int num_phy = 0, num_memcpy = 0, num_disabled = 0; int num_phy = 0, num_memcpy = 0, num_disabled = 0;
const __be32 *list; const __be32 *list;
pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
if (!pdata) if (!pdata)
return -ENOMEM; return -ENOMEM;
...@@ -3500,7 +3500,7 @@ static int __init d40_of_probe(struct platform_device *pdev, ...@@ -3500,7 +3500,7 @@ static int __init d40_of_probe(struct platform_device *pdev,
num_memcpy /= sizeof(*list); num_memcpy /= sizeof(*list);
if (num_memcpy > D40_MEMCPY_MAX_CHANS || num_memcpy <= 0) { if (num_memcpy > D40_MEMCPY_MAX_CHANS || num_memcpy <= 0) {
d40_err(&pdev->dev, d40_err(dev,
"Invalid number of memcpy channels specified (%d)\n", "Invalid number of memcpy channels specified (%d)\n",
num_memcpy); num_memcpy);
return -EINVAL; return -EINVAL;
...@@ -3515,7 +3515,7 @@ static int __init d40_of_probe(struct platform_device *pdev, ...@@ -3515,7 +3515,7 @@ static int __init d40_of_probe(struct platform_device *pdev,
num_disabled /= sizeof(*list); num_disabled /= sizeof(*list);
if (num_disabled >= STEDMA40_MAX_PHYS || num_disabled < 0) { if (num_disabled >= STEDMA40_MAX_PHYS || num_disabled < 0) {
d40_err(&pdev->dev, d40_err(dev,
"Invalid number of disabled channels specified (%d)\n", "Invalid number of disabled channels specified (%d)\n",
num_disabled); num_disabled);
return -EINVAL; return -EINVAL;
...@@ -3526,7 +3526,7 @@ static int __init d40_of_probe(struct platform_device *pdev, ...@@ -3526,7 +3526,7 @@ static int __init d40_of_probe(struct platform_device *pdev,
num_disabled); num_disabled);
pdata->disabled_channels[num_disabled] = -1; pdata->disabled_channels[num_disabled] = -1;
pdev->dev.platform_data = pdata; dev->platform_data = pdata;
return 0; return 0;
} }
...@@ -3534,7 +3534,6 @@ static int __init d40_of_probe(struct platform_device *pdev, ...@@ -3534,7 +3534,6 @@ static int __init d40_of_probe(struct platform_device *pdev,
static int __init d40_probe(struct platform_device *pdev) static int __init d40_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct stedma40_platform_data *plat_data = dev_get_platdata(dev);
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct device_node *np_lcpa; struct device_node *np_lcpa;
int ret = -ENOENT; int ret = -ENOENT;
...@@ -3544,7 +3543,7 @@ static int __init d40_probe(struct platform_device *pdev) ...@@ -3544,7 +3543,7 @@ static int __init d40_probe(struct platform_device *pdev)
int num_reserved_chans; int num_reserved_chans;
u32 val; u32 val;
if (d40_of_probe(pdev, np)) { if (d40_of_probe(dev, np)) {
ret = -ENOMEM; ret = -ENOMEM;
goto report_failure; goto report_failure;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment