remoteproc: st: Use device_get_match_data()
Use preferred device_get_match_data() instead of of_match_device() to get the driver match data. With this, adjust the includes to explicitly include the correct headers. Signed-off-by: Rob Herring <robh@kernel.org> Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com> Link: https://lore.kernel.org/r/20231009211356.3242037-10-robh@kernel.org Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
This commit is contained in:
parent
6013727fc3
commit
5c77ebcd05
@ -16,10 +16,9 @@
|
||||
#include <linux/mfd/syscon.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/of_reserved_mem.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/property.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/remoteproc.h>
|
||||
#include <linux/reset.h>
|
||||
@ -341,7 +340,6 @@ static int st_rproc_parse_dt(struct platform_device *pdev)
|
||||
static int st_rproc_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
const struct of_device_id *match;
|
||||
struct st_rproc *ddata;
|
||||
struct device_node *np = dev->of_node;
|
||||
struct rproc *rproc;
|
||||
@ -349,19 +347,15 @@ static int st_rproc_probe(struct platform_device *pdev)
|
||||
int enabled;
|
||||
int ret, i;
|
||||
|
||||
match = of_match_device(st_rproc_match, dev);
|
||||
if (!match || !match->data) {
|
||||
dev_err(dev, "No device match found\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
rproc = rproc_alloc(dev, np->name, &st_rproc_ops, NULL, sizeof(*ddata));
|
||||
if (!rproc)
|
||||
return -ENOMEM;
|
||||
|
||||
rproc->has_iommu = false;
|
||||
ddata = rproc->priv;
|
||||
ddata->config = (struct st_rproc_config *)match->data;
|
||||
ddata->config = (struct st_rproc_config *)device_get_match_data(dev);
|
||||
if (!ddata->config)
|
||||
goto free_rproc;
|
||||
|
||||
platform_set_drvdata(pdev, rproc);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user