diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 19:19:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:30 -0400 |
| commit | 479243b2cd763744cd740c05e5d61abc1c518256 (patch) | |
| tree | 15971db6c2a9b93cb520427c62d8d94b18ca9e82 /drivers/rtc/rtc-hid-sensor-time.c | |
| parent | 360fe134e2808fee04b73406424295d18d09ee85 (diff) | |
rtc: hid-sensor-time: use devm_rtc_device_register()
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>
Diffstat (limited to 'drivers/rtc/rtc-hid-sensor-time.c')
| -rw-r--r-- | drivers/rtc/rtc-hid-sensor-time.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-hid-sensor-time.c b/drivers/rtc/rtc-hid-sensor-time.c index 31c5728ef629..63024505dddc 100644 --- a/drivers/rtc/rtc-hid-sensor-time.c +++ b/drivers/rtc/rtc-hid-sensor-time.c | |||
| @@ -255,8 +255,9 @@ static int hid_time_probe(struct platform_device *pdev) | |||
| 255 | return ret; | 255 | return ret; |
| 256 | } | 256 | } |
| 257 | 257 | ||
| 258 | time_state->rtc = rtc_device_register("hid-sensor-time", | 258 | time_state->rtc = devm_rtc_device_register(&pdev->dev, |
| 259 | &pdev->dev, &hid_time_rtc_ops, THIS_MODULE); | 259 | "hid-sensor-time", &hid_time_rtc_ops, |
| 260 | THIS_MODULE); | ||
| 260 | 261 | ||
| 261 | if (IS_ERR(time_state->rtc)) { | 262 | if (IS_ERR(time_state->rtc)) { |
| 262 | dev_err(&pdev->dev, "rtc device register failed!\n"); | 263 | dev_err(&pdev->dev, "rtc device register failed!\n"); |
| @@ -269,9 +270,7 @@ static int hid_time_probe(struct platform_device *pdev) | |||
| 269 | static int hid_time_remove(struct platform_device *pdev) | 270 | static int hid_time_remove(struct platform_device *pdev) |
| 270 | { | 271 | { |
| 271 | struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data; | 272 | struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data; |
| 272 | struct hid_time_state *time_state = platform_get_drvdata(pdev); | ||
| 273 | 273 | ||
| 274 | rtc_device_unregister(time_state->rtc); | ||
| 275 | sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_TIME); | 274 | sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_TIME); |
| 276 | 275 | ||
| 277 | return 0; | 276 | return 0; |