Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Jingoo Han and committed by
Linus Torvalds
61cc483a 3d772d34

+5 -14
+5 -14
drivers/rtc/rtc-at91sam9.c
··· 324 324 rtc->rtt = devm_ioremap(&pdev->dev, r->start, resource_size(r)); 325 325 if (!rtc->rtt) { 326 326 dev_err(&pdev->dev, "failed to map registers, aborting.\n"); 327 - ret = -ENOMEM; 328 - goto fail; 327 + return -ENOMEM; 329 328 } 330 329 331 330 rtc->gpbr = devm_ioremap(&pdev->dev, r_gpbr->start, 332 331 resource_size(r_gpbr)); 333 332 if (!rtc->gpbr) { 334 333 dev_err(&pdev->dev, "failed to map gpbr registers, aborting.\n"); 335 - ret = -ENOMEM; 336 - goto fail; 334 + return -ENOMEM; 337 335 } 338 336 339 337 mr = rtt_readl(rtc, MR); ··· 348 350 349 351 rtc->rtcdev = devm_rtc_device_register(&pdev->dev, pdev->name, 350 352 &at91_rtc_ops, THIS_MODULE); 351 - if (IS_ERR(rtc->rtcdev)) { 352 - ret = PTR_ERR(rtc->rtcdev); 353 - goto fail; 354 - } 353 + if (IS_ERR(rtc->rtcdev)) 354 + return PTR_ERR(rtc->rtcdev); 355 355 356 356 /* register irq handler after we know what name we'll use */ 357 357 ret = devm_request_irq(&pdev->dev, rtc->irq, at91_rtc_interrupt, 358 358 IRQF_SHARED, dev_name(&rtc->rtcdev->dev), rtc); 359 359 if (ret) { 360 360 dev_dbg(&pdev->dev, "can't share IRQ %d?\n", rtc->irq); 361 - goto fail; 361 + return ret; 362 362 } 363 363 364 364 /* NOTE: sam9260 rev A silicon has a ROM bug which resets the ··· 370 374 dev_name(&rtc->rtcdev->dev)); 371 375 372 376 return 0; 373 - 374 - fail: 375 - platform_set_drvdata(pdev, NULL); 376 - return ret; 377 377 } 378 378 379 379 /* ··· 383 391 /* disable all interrupts */ 384 392 rtt_writel(rtc, MR, mr & ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN)); 385 393 386 - platform_set_drvdata(pdev, NULL); 387 394 return 0; 388 395 } 389 396