diff options
| author | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:02 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:02 +0000 |
| commit | 8c4d2a0bfbd27d030e4652b714cd5a1598f3559b (patch) | |
| tree | d8ea72d906a690109d2f7aeeb2dc9ec529c0d5a6 /sound/soc/jz4740/jz4740-i2s.c | |
| parent | 3701d2cb87671c227f1aa59226c9a01e9f01c2ea (diff) | |
| parent | 39870b0dec68ed7dd814beb697e541670975c7d8 (diff) | |
| download | lwn-8c4d2a0bfbd27d030e4652b714cd5a1598f3559b.tar.gz lwn-8c4d2a0bfbd27d030e4652b714cd5a1598f3559b.zip | |
Merge branch 'asoc-5.5' into asoc-next
Diffstat (limited to 'sound/soc/jz4740/jz4740-i2s.c')
| -rw-r--r-- | sound/soc/jz4740/jz4740-i2s.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c index 13408de34055..38d48d101783 100644 --- a/sound/soc/jz4740/jz4740-i2s.c +++ b/sound/soc/jz4740/jz4740-i2s.c @@ -497,15 +497,13 @@ static int jz4740_i2s_dev_probe(struct platform_device *pdev) struct jz4740_i2s *i2s; struct resource *mem; int ret; - const struct of_device_id *match; i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL); if (!i2s) return -ENOMEM; - match = of_match_device(jz4740_of_matches, &pdev->dev); - if (match) - i2s->version = (enum jz47xx_i2s_version)match->data; + i2s->version = + (enum jz47xx_i2s_version)of_device_get_match_data(&pdev->dev); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); i2s->base = devm_ioremap_resource(&pdev->dev, mem); |