Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit dd8d8137f54d852dc68bbf31c563ec6396541672

Authored by Jingoo Han
Committed by Linus Torvalds
1 parent cc40d642f8
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

rtc: rtc-test: 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>

Showing 1 changed file with 4 additions and 6 deletions Side-by-side Diff

drivers/rtc/rtc-test.c
Diff comments   View file @ dd8d813
... ... @@ -99,8 +99,10 @@
99 99 static int test_probe(struct platform_device *plat_dev)
100 100 {
101 101 int err;
102   - struct rtc_device *rtc = rtc_device_register("test", &plat_dev->dev,
103   - &test_rtc_ops, THIS_MODULE);
  102 + struct rtc_device *rtc;
  103 +
  104 + rtc = devm_rtc_device_register(&plat_dev->dev, "test",
  105 + &test_rtc_ops, THIS_MODULE);
104 106 if (IS_ERR(rtc)) {
105 107 err = PTR_ERR(rtc);
106 108 return err;
107 109  
... ... @@ -115,15 +117,11 @@
115 117 return 0;
116 118  
117 119 err:
118   - rtc_device_unregister(rtc);
119 120 return err;
120 121 }
121 122  
122 123 static int test_remove(struct platform_device *plat_dev)
123 124 {
124   - struct rtc_device *rtc = platform_get_drvdata(plat_dev);
125   -
126   - rtc_device_unregister(rtc);
127 125 device_remove_file(&plat_dev->dev, &dev_attr_irq);
128 126  
129 127 return 0;