diff options
Diffstat (limited to 'drivers/rtc/rtc-armada38x.c')
| -rw-r--r-- | drivers/rtc/rtc-armada38x.c | 12 | 
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/rtc/rtc-armada38x.c b/drivers/rtc/rtc-armada38x.c index 19d6980e90fb..9351bd52477e 100644 --- a/drivers/rtc/rtc-armada38x.c +++ b/drivers/rtc/rtc-armada38x.c @@ -502,7 +502,6 @@ static __init int armada38x_rtc_probe(struct platform_device *pdev)  	struct resource *res;  	struct armada38x_rtc *rtc;  	const struct of_device_id *match; -	int ret;  	match = of_match_device(armada38x_rtc_of_match_table, &pdev->dev);  	if (!match) @@ -530,11 +529,8 @@ static __init int armada38x_rtc_probe(struct platform_device *pdev)  		return PTR_ERR(rtc->regs_soc);  	rtc->irq = platform_get_irq(pdev, 0); - -	if (rtc->irq < 0) { -		dev_err(&pdev->dev, "no irq\n"); +	if (rtc->irq < 0)  		return rtc->irq; -	}  	rtc->rtc_dev = devm_rtc_allocate_device(&pdev->dev);  	if (IS_ERR(rtc->rtc_dev)) @@ -564,11 +560,7 @@ static __init int armada38x_rtc_probe(struct platform_device *pdev)  	rtc->rtc_dev->range_max = U32_MAX; -	ret = rtc_register_device(rtc->rtc_dev); -	if (ret) -		dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret); - -	return ret; +	return rtc_register_device(rtc->rtc_dev);  }  #ifdef CONFIG_PM_SLEEP  |