iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtc: rtc-x1205: use devm_rtc_device_register()

Browse Source 
devm_rtc_device_register() is device managed and makes cleanup paths
simpler.

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:
Jingoo Han 2013-04-29 16:19:55 -07:00 committed by Linus Torvalds
parent a5aa777692
commit 1758171805
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/rtc/rtc-x1205.c
View File

@ -630,8 +630,8 @@ static int x1205_probe(struct i2c_client *client,
dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n"); dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
rtc = rtc_device_register(x1205_driver.driver.name, &client->dev, rtc = devm_rtc_device_register(&client->dev, x1205_driver.driver.name,
&x1205_rtc_ops, THIS_MODULE); &x1205_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc)) if (IS_ERR(rtc))
return PTR_ERR(rtc); return PTR_ERR(rtc);
@ -653,21 +653,13 @@ static int x1205_probe(struct i2c_client *client,
err = x1205_sysfs_register(&client->dev); err = x1205_sysfs_register(&client->dev);
if (err) if (err)
goto exit_devreg; return err;
return 0; return 0;
exit_devreg:
rtc_device_unregister(rtc);
return err;
} }
static int x1205_remove(struct i2c_client *client) static int x1205_remove(struct i2c_client *client)
{ {
struct rtc_device *rtc = i2c_get_clientdata(client);
rtc_device_unregister(rtc);
x1205_sysfs_unregister(&client->dev); x1205_sysfs_unregister(&client->dev);
return 0; return 0;
} }