From patchwork Tue Oct 21 17:37:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 5126671 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 79C0DC11AC for ; Tue, 21 Oct 2014 17:45:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A3C4020221 for ; Tue, 21 Oct 2014 17:45:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B1D5C20220 for ; Tue, 21 Oct 2014 17:45:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933423AbaJURo7 (ORCPT ); Tue, 21 Oct 2014 13:44:59 -0400 Received: from mail-lb0-f177.google.com ([209.85.217.177]:56836 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933357AbaJURoy (ORCPT ); Tue, 21 Oct 2014 13:44:54 -0400 Received: by mail-lb0-f177.google.com with SMTP id w7so1479477lbi.36 for ; Tue, 21 Oct 2014 10:44:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=kQR9Q+dUlD7t/B3gN66IuXoZ9BuiGePjl5BHBBps894=; b=QUxREkx5cAdaFpFzCo3xP0i3IBOdKYOR4Tdnvk/JHHxiCzqI3YSifBVwuTlR/sxRYM 2hLX2N2QBJDRMPDmFCk/UAPszH/Pw96bZEje/ZpHUqVoIbkudpE20S2yFk8MFL2MmyxE xvLYG7+S+FHekKJo7HHi74ADjq4MCukf65XoVGuCACl/ZX04Y2XnrAEzd/91nsD6fKqi 373mOQSi4N9s/0FKOH5MJ8pwwkOZPxIH18nmWP9G/oRtxrkPIsOhtNl6xivIbOhmKBhR l7+CcB8jVgOS3hg8rQ9tZnKaqflKoCAj9LEEtCYLFgTx6UKNKNsSE/tBodmYWu65P6tX qSpg== X-Received: by 10.112.169.6 with SMTP id aa6mr11559350lbc.29.1413913492104; Tue, 21 Oct 2014 10:44:52 -0700 (PDT) Received: from xi.terra (s83-177-171-8.cust.tele2.se. [83.177.171.8]) by mx.google.com with ESMTPSA id dq5sm4811133lbc.11.2014.10.21.10.44.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Oct 2014 10:44:50 -0700 (PDT) X-Google-Original-Sender: Received: from johan by xi.terra with local (Exim 4.84) (envelope-from ) id 1XgdRN-0003N6-AL; Tue, 21 Oct 2014 19:41:49 +0200 From: Johan Hovold To: Alessandro Zummo , Tony Lindgren , =?UTF-8?q?Beno=C3=AEt=20Cousson?= , Felipe Balbi Cc: Andrew Morton , Lokesh Vutla , Guenter Roeck , nsekhar@ti.com, t-kristo@ti.com, j-keerthy@ti.com, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 04/20] rtc: omap: clean up probe error handling Date: Tue, 21 Oct 2014 19:37:50 +0200 Message-Id: <1413913086-12730-5-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1413913086-12730-1-git-send-email-johan@kernel.org> References: <1412881594-25678-1-git-send-email-johan@kernel.org> <1413913086-12730-1-git-send-email-johan@kernel.org> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove some debug messages and return errors from subsystems rather than always fail with -EIO. Note that the class-registration error has already been logged by rtc core. Signed-off-by: Johan Hovold --- drivers/rtc/rtc-omap.c | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index 813d475fe7c6..6b10db5a5702 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c @@ -379,6 +379,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev) u8 reg, new_ctrl; const struct platform_device_id *id_entry; const struct of_device_id *of_id; + int ret; of_id = of_match_device(omap_rtc_of_match, &pdev->dev); if (of_id) @@ -391,16 +392,12 @@ static int __init omap_rtc_probe(struct platform_device *pdev) } omap_rtc_timer = platform_get_irq(pdev, 0); - if (omap_rtc_timer <= 0) { - pr_debug("%s: no update irq?\n", pdev->name); + if (omap_rtc_timer <= 0) return -ENOENT; - } omap_rtc_alarm = platform_get_irq(pdev, 1); - if (omap_rtc_alarm <= 0) { - pr_debug("%s: no alarm irq?\n", pdev->name); + if (omap_rtc_alarm <= 0) return -ENOENT; - } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); rtc_base = devm_ioremap_resource(&pdev->dev, res); @@ -421,9 +418,8 @@ static int __init omap_rtc_probe(struct platform_device *pdev) rtc = devm_rtc_device_register(&pdev->dev, pdev->name, &omap_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) { - pr_debug("%s: can't register RTC device, err %ld\n", - pdev->name, PTR_ERR(rtc)); - goto fail0; + ret = PTR_ERR(rtc); + goto err; } platform_set_drvdata(pdev, rtc); @@ -451,18 +447,16 @@ static int __init omap_rtc_probe(struct platform_device *pdev) rtc_write(OMAP_RTC_STATUS_ALARM, OMAP_RTC_STATUS_REG); /* handle periodic and alarm irqs */ - if (devm_request_irq(&pdev->dev, omap_rtc_timer, rtc_irq, 0, - dev_name(&rtc->dev), rtc)) { - pr_debug("%s: RTC timer interrupt IRQ%d already claimed\n", - pdev->name, omap_rtc_timer); - goto fail0; - } - if ((omap_rtc_timer != omap_rtc_alarm) && - (devm_request_irq(&pdev->dev, omap_rtc_alarm, rtc_irq, 0, - dev_name(&rtc->dev), rtc))) { - pr_debug("%s: RTC alarm interrupt IRQ%d already claimed\n", - pdev->name, omap_rtc_alarm); - goto fail0; + ret = devm_request_irq(&pdev->dev, omap_rtc_timer, rtc_irq, 0, + dev_name(&rtc->dev), rtc); + if (ret) + goto err; + + if (omap_rtc_timer != omap_rtc_alarm) { + ret = devm_request_irq(&pdev->dev, omap_rtc_alarm, rtc_irq, 0, + dev_name(&rtc->dev), rtc); + if (ret) + goto err; } /* On boards with split power, RTC_ON_NOFF won't reset the RTC */ @@ -496,13 +490,14 @@ static int __init omap_rtc_probe(struct platform_device *pdev) return 0; -fail0: +err: device_init_wakeup(&pdev->dev, false); if (id_entry->driver_data & OMAP_RTC_HAS_KICKER) rtc_writel(0, OMAP_RTC_KICK0_REG); pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); - return -EIO; + + return ret; } static int __exit omap_rtc_remove(struct platform_device *pdev)