rtc: rtc-sa1100: remove unnecessary platform_set_drvdata()
The driver core clears the driver data to NULL after device_release or
on probe failure, since commit 0998d06310
("device-core: Ensure drvdata
= NULL when no driver is bound"). Thus, it is not needed to manually
clear the device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
fb9b525e79
commit
66600bbef9
1 changed files with 2 additions and 6 deletions
|
@ -249,7 +249,7 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
ret = clk_prepare_enable(info->clk);
|
ret = clk_prepare_enable(info->clk);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_enable_clk;
|
return ret;
|
||||||
/*
|
/*
|
||||||
* According to the manual we should be able to let RTTR be zero
|
* According to the manual we should be able to let RTTR be zero
|
||||||
* and then a default diviser for a 32.768KHz clock is used.
|
* and then a default diviser for a 32.768KHz clock is used.
|
||||||
|
@ -303,8 +303,6 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
|
||||||
return 0;
|
return 0;
|
||||||
err_dev:
|
err_dev:
|
||||||
clk_disable_unprepare(info->clk);
|
clk_disable_unprepare(info->clk);
|
||||||
err_enable_clk:
|
|
||||||
platform_set_drvdata(pdev, NULL);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -312,10 +310,8 @@ static int sa1100_rtc_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct sa1100_rtc *info = platform_get_drvdata(pdev);
|
struct sa1100_rtc *info = platform_get_drvdata(pdev);
|
||||||
|
|
||||||
if (info) {
|
if (info)
|
||||||
clk_disable_unprepare(info->clk);
|
clk_disable_unprepare(info->clk);
|
||||||
platform_set_drvdata(pdev, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue