From patchwork Tue Nov 22 14:33:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101469 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp2126880qge; Tue, 22 Nov 2016 06:34:23 -0800 (PST) X-Received: by 10.84.209.136 with SMTP id y8mr237524plh.114.1479825263730; Tue, 22 Nov 2016 06:34:23 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m16si19148728pgn.140.2016.11.22.06.34.23; Tue, 22 Nov 2016 06:34:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933630AbcKVOeU (ORCPT + 26 others); Tue, 22 Nov 2016 09:34:20 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:60247 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932982AbcKVOeT (ORCPT ); Tue, 22 Nov 2016 09:34:19 -0500 Received: from wuerfel.lan ([78.43.21.235]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0MOG72-1c3fpf1IzE-005V7u; Tue, 22 Nov 2016 15:34:03 +0100 From: Arnd Bergmann To: Daniel Lezcano , Thomas Gleixner Cc: Arnd Bergmann , Noam Camus , Vineet Gupta , Liviu Dudau , linux-kernel@vger.kernel.org Subject: [PATCH] clocksource: nps: avoid maybe-uninitialized warning Date: Tue, 22 Nov 2016 15:33:44 +0100 Message-Id: <20161122143401.1889409-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:K6u/xDsAPTuKq1jFK1cO7ii22xO0Y13Nh82yB2bymdTYWZufpu5 QcwPf8NByLw32fLF0BU774BhsXggX/x6HBKAxSeLbtTNxhCHwNaBDx1Ha43/GzXF2XT9/FT h0Kzugqq62qUNNZ+/21sSaKh4CQtjQmIg/E6H1setRbjvFp/FQwpenn3gRBrsBhsJh5xYpQ 9eSOVsngdUejUiIDbb+jQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:5WPWbhWYCwc=:cQEWcZvRRvuGqbmvDTjptd 9029CJGtlc28OXiHr+fi0ROfYz2r7puboCXuuu0q9kR0fUnGt0GO3BDPSG5UxUmcfexKYpG7a WGNaxklzhd5m35Q3HxszheJdExGtipEKEFZzXctuo3XJQwJwbw5+Qt8qL6r+VTo6Lw/wi22lN msECxDoqyBdSvdJvFbyDU1G6lx+9XfRUYHfV8oX9JbeHKpuXV0cRfTUpCS4W4fFduEXBzei0h ynenXLElKJr7ZBJZVrXyIBKui9sOIT3GfOLRyRXiz9I3stLjAm72V20S3p3TlawmCNECmARTO nqgyyU0VQov6+pdg/DPDOh8h175TjdAiDp10ebdl4CX/57TZMK3IMF3wkeq+unUAR21xnwNwL T8CvpaaZDAyuEM1Mh4KZ/jPxdkWdk0ROtKgV0k5Vfywv22JNmYyJrxzzKJvrIiqN0xEQe7514 j3slDp1dm/WSpsroqaSOQF5UkjGCrj/ZS3jdbwSllF9KJcWeG6EtHgaD72s4sD3GD5pd7rVSd X0mRnozIL1JELq5vwdW7DUBTwOODIIy/ZJ6SeAHwpb4hYK1aoiiqsqv5NUcHxSvkpkc05AoKm 3N1jXfD5XvA+VEisIugpVtI9BjI0dRsTYZwo8ygIJuffjAl6ONjda0aS+Sppk4P9pj3m6u3j7 Up+VCiPxaqHMcgI4ty847Xj9i7fO0zBIAT9e4jMnKObnDB1D8N6iUDW1J+D68dJUXHG8= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We get a harmless false-positive warning with the newly added nps clocksource driver: drivers/clocksource/timer-nps.c: In function 'nps_setup_clocksource': drivers/clocksource/timer-nps.c:102:6: error: 'nps_timer1_freq' may be used uninitialized in this function [-Werror=maybe-uninitialized] Gcc here fails to identify that IS_ERR() is only true if PTR_ERR() has a nonzero value. Using PTR_ERR_OR_ZERO() to convert the result first makes this obvious and shuts up the warning. Fixes: 0ee4d9922df5 ("clocksource: Add clockevent support to NPS400 driver") Signed-off-by: Arnd Bergmann --- drivers/clocksource/timer-nps.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/clocksource/timer-nps.c b/drivers/clocksource/timer-nps.c index b4c8a023a2d4..8da5e93b6810 100644 --- a/drivers/clocksource/timer-nps.c +++ b/drivers/clocksource/timer-nps.c @@ -53,9 +53,10 @@ static int __init nps_get_timer_clk(struct device_node *node, int ret; *clk = of_clk_get(node, 0); - if (IS_ERR(*clk)) { + ret = PTR_ERR_OR_ZERO(*clk); + if (ret) { pr_err("timer missing clk"); - return PTR_ERR(*clk); + return ret; } ret = clk_prepare_enable(*clk);