korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-13 23:34:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

drivers/rtc/rtc-isl1208.c: use devm_* APIs

Browse Source 
devm_* APIs are device managed and make code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Herbert Valerio Riedel <hvr@gnu.org>
Cc: 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:
Sachin Kamat 2013-11-12 15:10:30 -08:00 committed by Linus Torvalds
parent f3766250b2
commit adce8c14c9
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/rtc/rtc-isl1208.c
View File

@ -643,10 +643,11 @@ isl1208_probe(struct i2c_client *client, const struct i2c_device_id *id)
"chip found, driver version " DRV_VERSION "\n"); "chip found, driver version " DRV_VERSION "\n");
if (client->irq > 0) { if (client->irq > 0) {
rc = request_threaded_irq(client->irq, NULL, rc = devm_request_threaded_irq(&client->dev, client->irq, NULL,
isl1208_rtc_interrupt, isl1208_rtc_interrupt,
IRQF_SHARED, IRQF_SHARED,
isl1208_driver.driver.name, client); isl1208_driver.driver.name,
client);
if (!rc) { if (!rc) {
device_init_wakeup(&client->dev, 1); device_init_wakeup(&client->dev, 1);
enable_irq_wake(client->irq); enable_irq_wake(client->irq);
@ -658,20 +659,18 @@ isl1208_probe(struct i2c_client *client, const struct i2c_device_id *id)
} }
} }
rtc = rtc_device_register(isl1208_driver.driver.name, rtc = devm_rtc_device_register(&client->dev, isl1208_driver.driver.name,
&client->dev, &isl1208_rtc_ops, &isl1208_rtc_ops,
THIS_MODULE); THIS_MODULE);
if (IS_ERR(rtc)) { if (IS_ERR(rtc))
rc = PTR_ERR(rtc); return PTR_ERR(rtc);
goto exit_free_irq;
}
i2c_set_clientdata(client, rtc); i2c_set_clientdata(client, rtc);
rc = isl1208_i2c_get_sr(client); rc = isl1208_i2c_get_sr(client);
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;
} }
if (rc & ISL1208_REG_SR_RTCF) if (rc & ISL1208_REG_SR_RTCF)
@ -680,28 +679,15 @@ isl1208_probe(struct i2c_client *client, const struct i2c_device_id *id)
rc = sysfs_create_group(&client->dev.kobj, &isl1208_rtc_sysfs_files); rc = sysfs_create_group(&client->dev.kobj, &isl1208_rtc_sysfs_files);
if (rc) if (rc)
goto exit_unregister; return rc;
return 0; return 0;
exit_unregister:
rtc_device_unregister(rtc);
exit_free_irq:
if (client->irq)
free_irq(client->irq, client);
return rc;
} }
static int static int
isl1208_remove(struct i2c_client *client) isl1208_remove(struct i2c_client *client)
{ {
struct rtc_device *rtc = i2c_get_clientdata(client);
sysfs_remove_group(&client->dev.kobj, &isl1208_rtc_sysfs_files); sysfs_remove_group(&client->dev.kobj, &isl1208_rtc_sysfs_files);
rtc_device_unregister(rtc);
if (client->irq)
free_irq(client->irq, client);
return 0; return 0;
} }