Skip to content

Commit

Permalink
rtc: rtc-max6900: use devm_rtc_device_register()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jingoo Han authored and Linus Torvalds committed Apr 30, 2013
1 parent d5b6bb0 commit feb141d
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/rtc/rtc-max6900.c
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,6 @@ static int max6900_rtc_set_time(struct device *dev, struct rtc_time *tm)

static int max6900_remove(struct i2c_client *client)
{
struct rtc_device *rtc = i2c_get_clientdata(client);

if (rtc)
rtc_device_unregister(rtc);

return 0;
}

Expand All @@ -237,8 +232,8 @@ max6900_probe(struct i2c_client *client, const struct i2c_device_id *id)

dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");

rtc = rtc_device_register(max6900_driver.driver.name,
&client->dev, &max6900_rtc_ops, THIS_MODULE);
rtc = devm_rtc_device_register(&client->dev, max6900_driver.driver.name,
&max6900_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc))
return PTR_ERR(rtc);

Expand Down

0 comments on commit feb141d

Please sign in to comment.