* Stephen Warren wrote: > module_platform_drive saves some boiler-plate code. > > The devm_ APIs remove the need to manually clean up allocations, > thus removing some code. > > Signed-off-by: Stephen Warren <[email protected]> > --- > sound/soc/tegra/tegra_i2s.c | 45 +++++++++--------------------------------- > 1 files changed, 10 insertions(+), 35 deletions(-) > > diff --git a/sound/soc/tegra/tegra_i2s.c b/sound/soc/tegra/tegra_i2s.c [...] > @@ -422,43 +422,29 @@ static __devinit int tegra_i2s_platform_probe(struct > platform_device *pdev) > if (ret) { > dev_err(&pdev->dev, "Could not register DAI: %d\n", ret); > ret = -ENOMEM; > - goto err_unmap; > + goto err_clk_put; > } > > tegra_i2s_debug_add(i2s, pdev->id); > > return 0; > > -err_unmap: > - iounmap(i2s->regs); > -err_release: > - release_mem_region(mem->start, resource_size(mem)); > err_clk_put: > clk_put(i2s->clk_i2s); > -err_free: > - kfree(i2s); > -exit: > +err: > return ret; > } > > static int __devexit tegra_i2s_platform_remove(struct platform_device *pdev) > { > struct tegra_i2s *i2s = dev_get_drvdata(&pdev->dev); > - struct resource *res; > > snd_soc_unregister_dai(&pdev->dev); > > tegra_i2s_debug_remove(i2s); > > - iounmap(i2s->regs); > - > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - release_mem_region(res->start, resource_size(res)); > - > clk_put(i2s->clk_i2s); > > - kfree(i2s); > - > return 0; > } [...]
Is this perhaps missing a dev_set_drvdata(&pdev->dev, NULL) as well? Thierry
pgpTobctfMllK.pgp
Description: PGP signature
