diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-22 15:21:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-22 15:21:48 +0200 |
| commit | 7cf0f1426a909ed36a8b349a4a975e0d68b5edad (patch) | |
| tree | 0700bb26ceeefb95efc13c3247c04fe7207b509e /drivers/dma/img-mdc-dma.c | |
| parent | c907420fdaec78b17f59a6011cb5f9d6051c6a35 (diff) | |
| parent | 9bf6ffdabdd6e70a0b69d032a0aff091afe1773e (diff) | |
Merge branch 'locking/urgent' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/dma/img-mdc-dma.c')
| -rw-r--r-- | drivers/dma/img-mdc-dma.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/dma/img-mdc-dma.c b/drivers/dma/img-mdc-dma.c index a4c53be482cf..624f1e1e9c55 100644 --- a/drivers/dma/img-mdc-dma.c +++ b/drivers/dma/img-mdc-dma.c @@ -861,7 +861,6 @@ static int mdc_dma_probe(struct platform_device *pdev) { struct mdc_dma *mdma; struct resource *res; - const struct of_device_id *match; unsigned int i; u32 val; int ret; @@ -871,8 +870,7 @@ static int mdc_dma_probe(struct platform_device *pdev) return -ENOMEM; platform_set_drvdata(pdev, mdma); - match = of_match_device(mdc_dma_of_match, &pdev->dev); - mdma->soc = match->data; + mdma->soc = of_device_get_match_data(&pdev->dev); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); mdma->regs = devm_ioremap_resource(&pdev->dev, res); |