| Message ID | 20170919184447.4479-1-clabbe.montjoie@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | dmaengine: sun6i: sun4i-gpadc: use of_device_get_match_data | expand |
Hi, On Tue, Sep 19, 2017 at 06:44:47PM +0000, Corentin Labbe wrote: > The usage of of_device_get_match_data reduce the code size a bit. > Furthermore, it prevents an improbable dereference when > of_match_device() return NULL. > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> The prefix of your commit title is wrong, this isn't about the GPADC. Once fixed, Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
On Wed, Sep 20, 2017 at 08:58:14AM +0200, Maxime Ripard wrote: > Hi, > > On Tue, Sep 19, 2017 at 06:44:47PM +0000, Corentin Labbe wrote: > > The usage of of_device_get_match_data reduce the code size a bit. > > Furthermore, it prevents an improbable dereference when > > of_match_device() return NULL. > > > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > > The prefix of your commit title is wrong, this isn't about the GPADC. > > Once fixed, > Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > Maxime > A copy/paste error, sorry I will resend thanks Corentin Labbe
diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c index bcd496edc70f..584f4e82a9be 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -1064,7 +1064,6 @@ MODULE_DEVICE_TABLE(of, sun6i_dma_match); static int sun6i_dma_probe(struct platform_device *pdev) { - const struct of_device_id *device; struct sun6i_dma_dev *sdc; struct resource *res; int ret, i; @@ -1073,10 +1072,9 @@ static int sun6i_dma_probe(struct platform_device *pdev) if (!sdc) return -ENOMEM; - device = of_match_device(sun6i_dma_match, &pdev->dev); - if (!device) + sdc->cfg = of_device_get_match_data(&pdev->dev); + if (!sdc->cfg) return -ENODEV; - sdc->cfg = device->data; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); sdc->base = devm_ioremap_resource(&pdev->dev, res);
The usage of of_device_get_match_data reduce the code size a bit. Furthermore, it prevents an improbable dereference when of_match_device() return NULL. Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> --- drivers/dma/sun6i-dma.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.13.5