diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2017-11-14 10:33:24 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2017-11-14 10:33:24 +0530 |
| commit | b683fa223b45edae9ef95e4607e3a70ab09966d7 (patch) | |
| tree | c07445ccbda7773a2c542423fcc2abeef3523ceb /drivers | |
| parent | c7960fc5e0f445bc4c9e096814ed31efed469406 (diff) | |
| parent | 087ffdd2880b5dd7724ac6d0ca663da398fe1ccf (diff) | |
| download | linux-b683fa223b45edae9ef95e4607e3a70ab09966d7.tar.bz2 | |
Merge branch 'topic/renasas' into for-linus
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/nbpfaxi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/dma/nbpfaxi.c b/drivers/dma/nbpfaxi.c index d3f918a9ee76..50559338239b 100644 --- a/drivers/dma/nbpfaxi.c +++ b/drivers/dma/nbpfaxi.c @@ -1286,7 +1286,6 @@ MODULE_DEVICE_TABLE(of, nbpf_match); static int nbpf_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; - const struct of_device_id *of_id = of_match_device(nbpf_match, dev); struct device_node *np = dev->of_node; struct nbpf_device *nbpf; struct dma_device *dma_dev; @@ -1300,10 +1299,10 @@ static int nbpf_probe(struct platform_device *pdev) BUILD_BUG_ON(sizeof(struct nbpf_desc_page) > PAGE_SIZE); /* DT only */ - if (!np || !of_id || !of_id->data) + if (!np) return -ENODEV; - cfg = of_id->data; + cfg = of_device_get_match_data(dev); num_channels = cfg->num_channels; nbpf = devm_kzalloc(dev, sizeof(*nbpf) + num_channels * |