From 325a81357fe4c9f1c130e08a78bc743e92a1aee3 Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Mon, 29 Apr 2013 16:19:50 -0700 Subject: [PATCH] --- yaml --- r: 365775 b: refs/heads/master c: 7c1385b06d12783ec5e6463bf4d6414390858968 h: refs/heads/master i: 365773: b058fdd90b4940862e3f1055940d3e771bf212c4 365771: d53ac6689044d71e2516fb3a03290b4379150801 365767: b2af82acd4e660dcc55a4742963b2be16a479e3a 365759: a9cb8d019deb8dedacb65bbd9556523e87b175fd v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-rx8581.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 56c95b1b94e1..b7333bcce1d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92bb34ca4f3bea48973111d7364f90af2276b344 +refs/heads/master: 7c1385b06d12783ec5e6463bf4d6414390858968 diff --git a/trunk/drivers/rtc/rtc-rx8581.c b/trunk/drivers/rtc/rtc-rx8581.c index b0c272658fa2..07f3037b18f4 100644 --- a/trunk/drivers/rtc/rtc-rx8581.c +++ b/trunk/drivers/rtc/rtc-rx8581.c @@ -240,8 +240,8 @@ static int rx8581_probe(struct i2c_client *client, dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n"); - rtc = rtc_device_register(rx8581_driver.driver.name, - &client->dev, &rx8581_rtc_ops, THIS_MODULE); + rtc = devm_rtc_device_register(&client->dev, rx8581_driver.driver.name, + &rx8581_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) return PTR_ERR(rtc); @@ -253,10 +253,6 @@ static int rx8581_probe(struct i2c_client *client, static int rx8581_remove(struct i2c_client *client) { - struct rtc_device *rtc = i2c_get_clientdata(client); - - rtc_device_unregister(rtc); - return 0; }