mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
Merge series "ASoC: sunxi: Use devm_platform_get_and_ioremap_resource()" from Yang Yingliang <yangyingliang@huawei.com>:
Use devm_platform_get_and_ioremap_resource() to simplify code. Yang Yingliang (3): ASoC: sunxi: sun4i-codec: Use devm_platform_get_and_ioremap_resource() ASoC: sun4i-i2s: Use devm_platform_get_and_ioremap_resource() ASoC: sunxi: sun4i-spdif: Use devm_platform_get_and_ioremap_resource() sound/soc/sunxi/sun4i-codec.c | 3 +-- sound/soc/sunxi/sun4i-i2s.c | 3 +-- sound/soc/sunxi/sun4i-spdif.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) -- 2.25.1
This commit is contained in:
commit
ef7eb57d21
@ -1709,8 +1709,7 @@ static int sun4i_codec_probe(struct platform_device *pdev)
|
||||
|
||||
scodec->dev = &pdev->dev;
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
base = devm_ioremap_resource(&pdev->dev, res);
|
||||
base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
|
||||
if (IS_ERR(base))
|
||||
return PTR_ERR(base);
|
||||
|
||||
|
@ -1470,8 +1470,7 @@ static int sun4i_i2s_probe(struct platform_device *pdev)
|
||||
return -ENOMEM;
|
||||
platform_set_drvdata(pdev, i2s);
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
regs = devm_ioremap_resource(&pdev->dev, res);
|
||||
regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
|
||||
if (IS_ERR(regs))
|
||||
return PTR_ERR(regs);
|
||||
|
||||
|
@ -518,8 +518,7 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
|
||||
host->cpu_dai_drv.name = dev_name(&pdev->dev);
|
||||
|
||||
/* Get the addresses */
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
base = devm_ioremap_resource(&pdev->dev, res);
|
||||
base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
|
||||
if (IS_ERR(base))
|
||||
return PTR_ERR(base);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user