Commit 55d735ef authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

rtc: rtc-sa1100: use devm_*() functions 



Use devm_*() functions to make cleanup paths simpler.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b4cd3d6a

drivers/rtc/rtc-sa1100.c

+5 −12
Original line number Diff line number Diff line
@@ -234,14 +234,13 @@ static int sa1100_rtc_probe(struct platform_device *pdev) 
	if (irq_1hz < 0 || irq_alarm < 0)

		return -ENODEV;



	info = kzalloc(sizeof(struct sa1100_rtc), GFP_KERNEL);

	info = devm_kzalloc(&pdev->dev, sizeof(struct sa1100_rtc), GFP_KERNEL);

	if (!info)

		return -ENOMEM;

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

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

	if (IS_ERR(info->clk)) {

		dev_err(&pdev->dev, "failed to find rtc clock source\n");

		ret = PTR_ERR(info->clk);

		goto err_clk;

		return PTR_ERR(info->clk);

	}

	info->irq_1hz = irq_1hz;

	info->irq_alarm = irq_alarm;
@@ -268,7 +267,7 @@ static int sa1100_rtc_probe(struct platform_device *pdev) 


	device_init_wakeup(&pdev->dev, 1);



	rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops,

	rtc = devm_rtc_device_register(&pdev->dev, pdev->name, &sa1100_rtc_ops,

					THIS_MODULE);



	if (IS_ERR(rtc)) {
@@ -306,9 +305,6 @@ static int sa1100_rtc_probe(struct platform_device *pdev) 
	clk_disable_unprepare(info->clk);

err_enable_clk:

	platform_set_drvdata(pdev, NULL);

	clk_put(info->clk);

err_clk:

	kfree(info);

	return ret;

}
@@ -317,11 +313,8 @@ static int sa1100_rtc_remove(struct platform_device *pdev) 
	struct sa1100_rtc *info = platform_get_drvdata(pdev);



	if (info) {

		rtc_device_unregister(info->rtc);

		clk_disable_unprepare(info->clk);

		clk_put(info->clk);

		platform_set_drvdata(pdev, NULL);

		kfree(info);

	}



	return 0;