luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtc: rtc-rv3029c2: 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:48 -07:00 committed by Linus Torvalds
parent 284e2fa1da
commit 3d7068c9d5
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/rtc/rtc-rv3029c2.c
View File

@ -395,9 +395,8 @@ static int rv3029c2_probe(struct i2c_client *client,
if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_EMUL)) if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_EMUL))
return -ENODEV; return -ENODEV;
rtc = rtc_device_register(client->name, rtc = devm_rtc_device_register(&client->dev, client->name,
&client->dev, &rv3029c2_rtc_ops, &rv3029c2_rtc_ops, THIS_MODULE);
THIS_MODULE);
if (IS_ERR(rtc)) if (IS_ERR(rtc))
return PTR_ERR(rtc); return PTR_ERR(rtc);
@ -407,23 +406,14 @@ static int rv3029c2_probe(struct i2c_client *client,
rc = rv3029c2_i2c_get_sr(client, buf); rc = rv3029c2_i2c_get_sr(client, buf);
if (rc < 0) { if (rc < 0) {
dev_err(&client->dev, "reading status failed\n"); dev_err(&client->dev, "reading status failed\n");
goto exit_unregister; return rc;
} }
return 0; return 0;
exit_unregister:
rtc_device_unregister(rtc);
return rc;
} }
static int rv3029c2_remove(struct i2c_client *client) static int rv3029c2_remove(struct i2c_client *client)
{ {
struct rtc_device *rtc = i2c_get_clientdata(client);
rtc_device_unregister(rtc);
return 0; return 0;
} }