From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967921AbcHBQcY (ORCPT ); Tue, 2 Aug 2016 12:32:24 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:36364 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932957AbcHBMJ3 (ORCPT ); Tue, 2 Aug 2016 08:09:29 -0400 Subject: Re: [PATCH] clocksource: mips-gic-timer: make gic_clocksource_of_init return int To: Paul Gortmaker , linux-kernel@vger.kernel.org, Thomas Gleixner References: <20160801033546.26472-1-paul.gortmaker@windriver.com> Cc: linux-mips@linux-mips.org From: Daniel Lezcano Message-ID: <57A08D73.6070100@linaro.org> Date: Tue, 2 Aug 2016 14:09:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux i686; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <20160801033546.26472-1-paul.gortmaker@windriver.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 08/01/2016 05:35 AM, Paul Gortmaker wrote: > In commit d8152bf85d2c057fc39c3e20a4d623f524d9f09c: > ("clocksource/drivers/mips-gic-timer: Convert init function to return error") > > several return values were added to a void function resulting in: > > clocksource/mips-gic-timer.c: In function 'gic_clocksource_of_init': > clocksource/mips-gic-timer.c:175:3: warning: 'return' with a value, in function returning void [enabled by default] > clocksource/mips-gic-timer.c:183:4: warning: 'return' with a value, in function returning void [enabled by default] > clocksource/mips-gic-timer.c:190:3: warning: 'return' with a value, in function returning void [enabled by default] > clocksource/mips-gic-timer.c:195:3: warning: 'return' with a value, in function returning void [enabled by default] > clocksource/mips-gic-timer.c:200:3: warning: 'return' with a value, in function returning void [enabled by default] > clocksource/mips-gic-timer.c:211:2: warning: 'return' with a value, in function returning void [enabled by default] > clocksource/mips-gic-timer.c: At top level: > clocksource/mips-gic-timer.c:213:1: warning: comparison of distinct pointer types lacks a cast [enabled by default] > clocksource/mips-gic-timer.c: In function 'gic_clocksource_of_init': > clocksource/mips-gic-timer.c:183:18: warning: ignoring return value of 'PTR_ERR', declared with attribute warn_unused_result [-Wunused-result] > > Given that the addition of the return values was intentional, it seems > that the conversion of the containing function from void to int was > simply overlooked. > > Cc: Daniel Lezcano > Cc: linux-mips@linux-mips.org > Signed-off-by: Paul Gortmaker Acked-by: Daniel Lezcano Thomas, can you merge this patch in tip/timers/urgent ? Thanks ! -- Daniel > --- > drivers/clocksource/mips-gic-timer.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c > index d91e8725917c..b4b3ab5a11ad 100644 > --- a/drivers/clocksource/mips-gic-timer.c > +++ b/drivers/clocksource/mips-gic-timer.c > @@ -164,7 +164,7 @@ void __init gic_clocksource_init(unsigned int frequency) > gic_start_count(); > } > > -static void __init gic_clocksource_of_init(struct device_node *node) > +static int __init gic_clocksource_of_init(struct device_node *node) > { > struct clk *clk; > int ret; > -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog