Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a81de2076c32f2b02c454cfb16fdba63050c30b7

Authored by Jingoo Han
Committed by Linus Torvalds
1 parent 7f1c2e824e
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

rtc: rtc-rp5c01: remove unnecessary platform_set_drvdata() 

The driver core clears the driver data to NULL after device_release or
on probe failure, since commit 0998d063100 ("device-core: Ensure drvdata
= NULL when no driver is bound").  Thus, it is not needed to manually
clear the device driver data to NULL.

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 3 additions and 9 deletions Side-by-side Diff

drivers/rtc/rtc-rp5c01.c
Diff comments   View file @ a81de20
... ... @@ -251,21 +251,15 @@
251 251  
252 252 rtc = devm_rtc_device_register(&dev->dev, "rtc-rp5c01", &rp5c01_rtc_ops,
253 253 THIS_MODULE);
254   - if (IS_ERR(rtc)) {
255   - error = PTR_ERR(rtc);
256   - goto out;
257   - }
  254 + if (IS_ERR(rtc))
  255 + return PTR_ERR(rtc);
258 256 priv->rtc = rtc;
259 257  
260 258 error = sysfs_create_bin_file(&dev->dev.kobj, &priv->nvram_attr);
261 259 if (error)
262   - goto out;
  260 + return error;
263 261  
264 262 return 0;
265   -
266   -out:
267   - platform_set_drvdata(dev, NULL);
268   - return error;
269 263 }
270 264  
271 265 static int __exit rp5c01_rtc_remove(struct platform_device *dev)