Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 13:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: jz4740-i2s: Use managed resources

Browse Source 
Makes the code a bit shorter.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Lars-Peter Clausen 2013-12-03 18:53:02 +01:00 committed by Mark Brown
parent 6ce4eac1f6
commit b84c9ce809
1 changed files with 15 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
sound/soc/jz4740/jz4740-i2s.c
View File

@ -432,91 +432,36 @@ static const struct snd_soc_component_driver jz4740_i2s_component = {
static int jz4740_i2s_dev_probe(struct platform_device *pdev) static int jz4740_i2s_dev_probe(struct platform_device *pdev)
{ {
struct jz4740_i2s *i2s; struct jz4740_i2s *i2s;
struct resource *mem;
int ret; int ret;
i2s = kzalloc(sizeof(*i2s), GFP_KERNEL); i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL);
if (!i2s) if (!i2s)
return -ENOMEM; return -ENOMEM;
i2s->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!i2s->mem) { i2s->base = devm_ioremap_resource(&pdev->dev, mem);
ret = -ENOENT; if (IS_ERR(i2s->base))
goto err_free; return PTR_ERR(i2s->base);
}
i2s->mem = request_mem_region(i2s->mem->start, resource_size(i2s->mem), i2s->phys_base = mem->start;
pdev->name);
if (!i2s->mem) {
ret = -EBUSY;
goto err_free;
}
i2s->base = ioremap_nocache(i2s->mem->start, resource_size(i2s->mem)); i2s->clk_aic = devm_clk_get(&pdev->dev, "aic");
if (!i2s->base) { if (IS_ERR(i2s->clk_aic))
ret = -EBUSY; return PTR_ERR(i2s->clk_aic);
goto err_release_mem_region;
}
i2s->phys_base = i2s->mem->start; i2s->clk_i2s = devm_clk_get(&pdev->dev, "i2s");
if (IS_ERR(i2s->clk_i2s))
i2s->clk_aic = clk_get(&pdev->dev, "aic"); return PTR_ERR(i2s->clk_i2s);
if (IS_ERR(i2s->clk_aic)) {
ret = PTR_ERR(i2s->clk_aic);
goto err_iounmap;
}
i2s->clk_i2s = clk_get(&pdev->dev, "i2s");
if (IS_ERR(i2s->clk_i2s)) {
ret = PTR_ERR(i2s->clk_i2s);
goto err_clk_put_aic;
}
platform_set_drvdata(pdev, i2s); platform_set_drvdata(pdev, i2s);
ret = snd_soc_register_component(&pdev->dev, &jz4740_i2s_component,
&jz4740_i2s_dai, 1);
if (ret) { return devm_snd_soc_register_component(&pdev->dev,
dev_err(&pdev->dev, "Failed to register DAI\n"); &jz4740_i2s_component, &jz4740_i2s_dai, 1);
goto err_clk_put_i2s;
}
return 0;
err_clk_put_i2s:
clk_put(i2s->clk_i2s);
err_clk_put_aic:
clk_put(i2s->clk_aic);
err_iounmap:
iounmap(i2s->base);
err_release_mem_region:
release_mem_region(i2s->mem->start, resource_size(i2s->mem));
err_free:
kfree(i2s);
return ret;
}
static int jz4740_i2s_dev_remove(struct platform_device *pdev)
{
struct jz4740_i2s *i2s = platform_get_drvdata(pdev);
snd_soc_unregister_component(&pdev->dev);
clk_put(i2s->clk_i2s);
clk_put(i2s->clk_aic);
iounmap(i2s->base);
release_mem_region(i2s->mem->start, resource_size(i2s->mem));
kfree(i2s);
return 0;
} }
static struct platform_driver jz4740_i2s_driver = { static struct platform_driver jz4740_i2s_driver = {
.probe = jz4740_i2s_dev_probe, .probe = jz4740_i2s_dev_probe,
.remove = jz4740_i2s_dev_remove,
.driver = { .driver = {
.name = "jz4740-i2s", .name = "jz4740-i2s",
.owner = THIS_MODULE, .owner = THIS_MODULE,