lkml.org 
[lkml]   [2023]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] remoteproc: st: Use device_get_match_data()
    On Mon, Oct 09, 2023 at 04:13:40PM -0500, Rob Herring wrote:
    > 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>
    > ---
    > drivers/remoteproc/st_remoteproc.c | 14 ++++----------
    > 1 file changed, 4 insertions(+), 10 deletions(-)
    >

    Applied.

    Thanks,
    Mathieu

    > diff --git a/drivers/remoteproc/st_remoteproc.c b/drivers/remoteproc/st_remoteproc.c
    > index e3ce01d98b4c..b0638f984842 100644
    > --- a/drivers/remoteproc/st_remoteproc.c
    > +++ b/drivers/remoteproc/st_remoteproc.c
    > @@ -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);
    >
    > --
    > 2.42.0
    >

    \
     
     \ /
      Last update: 2023-10-11 19:46    [W:5.954 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site