Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22d260bd authored by Shawn Guo's avatar Shawn Guo Committed by Thierry Reding
Browse files

pwm: pwm-mxs: use devm_* managed functions 



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

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
parent 01bf32e9

drivers/pwm/pwm-mxs.c

+8 −16
Original line number Diff line number Diff line
@@ -129,21 +129,21 @@ static int mxs_pwm_probe(struct platform_device *pdev) 
{

	struct device_node *np = pdev->dev.of_node;

	struct mxs_pwm_chip *mxs;

	struct resource *res;

	int ret;



	mxs = devm_kzalloc(&pdev->dev, sizeof(*mxs), GFP_KERNEL);

	if (!mxs)

		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)

		return -EADDRNOTAVAIL;



	mxs->clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(mxs->clk)) {

		ret = PTR_ERR(mxs->clk);

		goto iounmap;

	}

	mxs->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(mxs->clk))

		return PTR_ERR(mxs->clk);



	mxs->chip.dev = &pdev->dev;

	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);

	if (ret < 0) {

		dev_err(&pdev->dev, "failed to get pwm number: %d\n", ret);

		goto clk_put;

		return ret;

	}



	ret = pwmchip_add(&mxs->chip);

	if (ret < 0) {

		dev_err(&pdev->dev, "failed to add pwm chip %d\n", ret);

		goto clk_put;

		return ret;

	}



	mxs->dev = &pdev->dev;
@@ -166,12 +166,6 @@ static int mxs_pwm_probe(struct platform_device *pdev) 
	stmp_reset_block(mxs->base);



	return 0;



clk_put:

	clk_put(mxs->clk);

iounmap:

	iounmap(mxs->base);

	return ret;

}



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);



	pwmchip_remove(&mxs->chip);

	clk_put(mxs->clk);

	iounmap(mxs->base);



	return 0;

}