Skip to content

Commit

Permalink
ASoC: fsi: convert to devm_xxx()
Browse files Browse the repository at this point in the history
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Sep 10, 2012
1 parent dbd4e51 commit 6ac4262
Showing 1 changed file with 8 additions and 17 deletions.
25 changes: 8 additions & 17 deletions sound/soc/sh/fsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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 */
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down

0 comments on commit 6ac4262

Please sign in to comment.