dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

pwm: pwm-mxs: use devm_* managed functions 

Use devm_* managed functions to have a clean fail-out.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
This commit is contained in:
Shawn Guo 2012-06-26 16:58:10 +08:00 committed by Thierry Reding
parent 01bf32e949
commit 22d260bd88
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/pwm/pwm-mxs.c
View File

@ -129,21 +129,21 @@ static int mxs_pwm_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct mxs_pwm_chip *mxs; struct mxs_pwm_chip *mxs;
struct resource *res;
int ret; int ret;
mxs = devm_kzalloc(&pdev->dev, sizeof(*mxs), GFP_KERNEL); mxs = devm_kzalloc(&pdev->dev, sizeof(*mxs), GFP_KERNEL);
if (!mxs) if (!mxs)
return -ENOMEM; return -ENOMEM;
mxs->base = of_iomap(np, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
mxs->base = devm_request_and_ioremap(&pdev->dev, res);
if (!mxs->base) if (!mxs->base)
return -EADDRNOTAVAIL; return -EADDRNOTAVAIL;
mxs->clk = clk_get(&pdev->dev, NULL); mxs->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(mxs->clk)) { if (IS_ERR(mxs->clk))
ret = PTR_ERR(mxs->clk); return PTR_ERR(mxs->clk);
goto iounmap;
}
mxs->chip.dev = &pdev->dev; mxs->chip.dev = &pdev->dev;
mxs->chip.ops = &mxs_pwm_ops; mxs->chip.ops = &mxs_pwm_ops;
@ -151,13 +151,13 @@ static int mxs_pwm_probe(struct platform_device *pdev)
ret = of_property_read_u32(np, "fsl,pwm-number", &mxs->chip.npwm); ret = of_property_read_u32(np, "fsl,pwm-number", &mxs->chip.npwm);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "failed to get pwm number: %d\n", ret); dev_err(&pdev->dev, "failed to get pwm number: %d\n", ret);
goto clk_put; return ret;
} }
ret = pwmchip_add(&mxs->chip); ret = pwmchip_add(&mxs->chip);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "failed to add pwm chip %d\n", ret); dev_err(&pdev->dev, "failed to add pwm chip %d\n", ret);
goto clk_put; return ret;
} }
mxs->dev = &pdev->dev; mxs->dev = &pdev->dev;
@ -166,12 +166,6 @@ static int mxs_pwm_probe(struct platform_device *pdev)
stmp_reset_block(mxs->base); stmp_reset_block(mxs->base);
return 0; return 0;
clk_put:
clk_put(mxs->clk);
iounmap:
iounmap(mxs->base);
return ret;
} }
static int __devexit mxs_pwm_remove(struct platform_device *pdev) static int __devexit mxs_pwm_remove(struct platform_device *pdev)
@ -179,8 +173,6 @@ static int __devexit mxs_pwm_remove(struct platform_device *pdev)
struct mxs_pwm_chip *mxs = platform_get_drvdata(pdev); struct mxs_pwm_chip *mxs = platform_get_drvdata(pdev);
pwmchip_remove(&mxs->chip); pwmchip_remove(&mxs->chip);
clk_put(mxs->clk);
iounmap(mxs->base);
return 0; return 0;
} }