mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
ASoC: fsi: convert to devm_xxx()
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
dbd4e51cd1
commit
6ac4262f36
1 changed files with 8 additions and 17 deletions
|
@ -1655,22 +1655,20 @@ static int fsi_probe(struct platform_device *pdev)
|
|||
irq = platform_get_irq(pdev, 0);
|
||||
if (!res || (int)irq <= 0) {
|
||||
dev_err(&pdev->dev, "Not enough FSI platform resources.\n");
|
||||
ret = -ENODEV;
|
||||
goto exit;
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
master = kzalloc(sizeof(*master), GFP_KERNEL);
|
||||
master = devm_kzalloc(&pdev->dev, sizeof(*master), GFP_KERNEL);
|
||||
if (!master) {
|
||||
dev_err(&pdev->dev, "Could not allocate master\n");
|
||||
ret = -ENOMEM;
|
||||
goto exit;
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
master->base = ioremap_nocache(res->start, resource_size(res));
|
||||
master->base = devm_ioremap_nocache(&pdev->dev,
|
||||
res->start, resource_size(res));
|
||||
if (!master->base) {
|
||||
ret = -ENXIO;
|
||||
dev_err(&pdev->dev, "Unable to ioremap FSI registers.\n");
|
||||
goto exit_kfree;
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
/* master setting */
|
||||
|
@ -1686,7 +1684,7 @@ static int fsi_probe(struct platform_device *pdev)
|
|||
ret = fsi_stream_probe(&master->fsia, &pdev->dev);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "FSIA stream probe failed\n");
|
||||
goto exit_iounmap;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* FSI B setting */
|
||||
|
@ -1734,11 +1732,7 @@ static int fsi_probe(struct platform_device *pdev)
|
|||
fsi_stream_remove(&master->fsib);
|
||||
exit_fsia:
|
||||
fsi_stream_remove(&master->fsia);
|
||||
exit_iounmap:
|
||||
iounmap(master->base);
|
||||
exit_kfree:
|
||||
kfree(master);
|
||||
exit:
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -1757,9 +1751,6 @@ static int fsi_remove(struct platform_device *pdev)
|
|||
fsi_stream_remove(&master->fsia);
|
||||
fsi_stream_remove(&master->fsib);
|
||||
|
||||
iounmap(master->base);
|
||||
kfree(master);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue