misc/ep93xx_pwm: use managed device resources
Use managed device resources to clean up the probe/remove. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Ryan Mallon <rmallon@gmail.com> Cc: Matthieu Crapet <mcrapet@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
01fe7b43e7
Коммит
6c7dd64abd
|
@ -273,50 +273,33 @@ static int __init ep93xx_pwm_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct ep93xx_pwm *pwm;
|
struct ep93xx_pwm *pwm;
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
int err;
|
int ret;
|
||||||
|
|
||||||
err = ep93xx_pwm_acquire_gpio(pdev);
|
pwm = devm_kzalloc(&pdev->dev, sizeof(*pwm), GFP_KERNEL);
|
||||||
if (err)
|
if (!pwm)
|
||||||
return err;
|
return -ENOMEM;
|
||||||
|
|
||||||
pwm = kzalloc(sizeof(struct ep93xx_pwm), GFP_KERNEL);
|
pwm->clk = devm_clk_get(&pdev->dev, "pwm_clk");
|
||||||
if (!pwm) {
|
if (IS_ERR(pwm->clk))
|
||||||
err = -ENOMEM;
|
return PTR_ERR(pwm->clk);
|
||||||
goto fail_no_mem;
|
|
||||||
}
|
|
||||||
|
|
||||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
if (res == NULL) {
|
pwm->mmio_base = devm_ioremap_resource(&pdev->dev, res);
|
||||||
err = -ENXIO;
|
if (IS_ERR(pwm->mmio_base))
|
||||||
goto fail_no_mem_resource;
|
return PTR_ERR(pwm->mmio_base);
|
||||||
}
|
|
||||||
|
|
||||||
res = request_mem_region(res->start, resource_size(res), pdev->name);
|
ret = ep93xx_pwm_acquire_gpio(pdev);
|
||||||
if (res == NULL) {
|
if (ret)
|
||||||
err = -EBUSY;
|
return ret;
|
||||||
goto fail_no_mem_resource;
|
|
||||||
}
|
|
||||||
|
|
||||||
pwm->mmio_base = ioremap(res->start, resource_size(res));
|
ret = sysfs_create_group(&pdev->dev.kobj, &ep93xx_pwm_sysfs_files);
|
||||||
if (pwm->mmio_base == NULL) {
|
if (ret) {
|
||||||
err = -ENXIO;
|
ep93xx_pwm_release_gpio(pdev);
|
||||||
goto fail_no_ioremap;
|
return ret;
|
||||||
}
|
|
||||||
|
|
||||||
err = sysfs_create_group(&pdev->dev.kobj, &ep93xx_pwm_sysfs_files);
|
|
||||||
if (err)
|
|
||||||
goto fail_no_sysfs;
|
|
||||||
|
|
||||||
pwm->clk = clk_get(&pdev->dev, "pwm_clk");
|
|
||||||
if (IS_ERR(pwm->clk)) {
|
|
||||||
err = PTR_ERR(pwm->clk);
|
|
||||||
goto fail_no_clk;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pwm->duty_percent = 50;
|
pwm->duty_percent = 50;
|
||||||
|
|
||||||
platform_set_drvdata(pdev, pwm);
|
|
||||||
|
|
||||||
/* disable pwm at startup. Avoids zero value. */
|
/* disable pwm at startup. Avoids zero value. */
|
||||||
ep93xx_pwm_disable(pwm);
|
ep93xx_pwm_disable(pwm);
|
||||||
ep93xx_pwm_write_tc(pwm, EP93XX_PWM_MAX_COUNT);
|
ep93xx_pwm_write_tc(pwm, EP93XX_PWM_MAX_COUNT);
|
||||||
|
@ -324,33 +307,17 @@ static int __init ep93xx_pwm_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
clk_enable(pwm->clk);
|
clk_enable(pwm->clk);
|
||||||
|
|
||||||
|
platform_set_drvdata(pdev, pwm);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
fail_no_clk:
|
|
||||||
sysfs_remove_group(&pdev->dev.kobj, &ep93xx_pwm_sysfs_files);
|
|
||||||
fail_no_sysfs:
|
|
||||||
iounmap(pwm->mmio_base);
|
|
||||||
fail_no_ioremap:
|
|
||||||
release_mem_region(res->start, resource_size(res));
|
|
||||||
fail_no_mem_resource:
|
|
||||||
kfree(pwm);
|
|
||||||
fail_no_mem:
|
|
||||||
ep93xx_pwm_release_gpio(pdev);
|
|
||||||
return err;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __exit ep93xx_pwm_remove(struct platform_device *pdev)
|
static int __exit ep93xx_pwm_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct ep93xx_pwm *pwm = platform_get_drvdata(pdev);
|
struct ep93xx_pwm *pwm = platform_get_drvdata(pdev);
|
||||||
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
||||||
|
|
||||||
ep93xx_pwm_disable(pwm);
|
ep93xx_pwm_disable(pwm);
|
||||||
clk_disable(pwm->clk);
|
clk_disable(pwm->clk);
|
||||||
clk_put(pwm->clk);
|
|
||||||
sysfs_remove_group(&pdev->dev.kobj, &ep93xx_pwm_sysfs_files);
|
sysfs_remove_group(&pdev->dev.kobj, &ep93xx_pwm_sysfs_files);
|
||||||
iounmap(pwm->mmio_base);
|
|
||||||
release_mem_region(res->start, resource_size(res));
|
|
||||||
kfree(pwm);
|
|
||||||
ep93xx_pwm_release_gpio(pdev);
|
ep93xx_pwm_release_gpio(pdev);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче