diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-04-12 15:37:54 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-04-12 15:37:54 +1000 |
| commit | efaadb89bfb65e10027b2e330b2edf9e4c3e36dc (patch) | |
| tree | 893ef3c707d92edded173fe29ba92d6fcb15a795 /drivers/rtc/rtc-dm355evm.c | |
| parent | 8aca60ef32d0ec6da54f92b4f545d86c4c5d129a (diff) | |
| parent | 70035331f72709835ff0cb69c8b4e9719b57e63e (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/rtc/rtc-dm355evm.c')
| -rw-r--r-- | drivers/rtc/rtc-dm355evm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c index b2ed2c94b081..1e1ca63d58a9 100644 --- a/drivers/rtc/rtc-dm355evm.c +++ b/drivers/rtc/rtc-dm355evm.c @@ -127,8 +127,8 @@ static int dm355evm_rtc_probe(struct platform_device *pdev) { struct rtc_device *rtc; - rtc = rtc_device_register(pdev->name, - &pdev->dev, &dm355evm_rtc_ops, THIS_MODULE); + rtc = devm_rtc_device_register(&pdev->dev, pdev->name, + &dm355evm_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) { dev_err(&pdev->dev, "can't register RTC device, err %ld\n", PTR_ERR(rtc)); @@ -141,9 +141,6 @@ static int dm355evm_rtc_probe(struct platform_device *pdev) static int dm355evm_rtc_remove(struct platform_device *pdev) { - struct rtc_device *rtc = platform_get_drvdata(pdev); - - rtc_device_unregister(rtc); platform_set_drvdata(pdev, NULL); return 0; } |