From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757988AbcG0FZ7 (ORCPT ); Wed, 27 Jul 2016 01:25:59 -0400 Received: from 216-12-86-13.cv.mvl.ntelos.net ([216.12.86.13]:59223 "EHLO brightrain.aerifal.cx" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750701AbcG0FZw (ORCPT ); Wed, 27 Jul 2016 01:25:52 -0400 Date: Wed, 27 Jul 2016 01:25:33 -0400 From: Rich Felker To: Arnd Bergmann Cc: Daniel Lezcano , Thomas Gleixner , linux-kernel@vger.kernel.org Subject: Re: [PATCH] clocksource: j-core: type fix init function return code Message-ID: <20160727052533.GA6689@brightrain.aerifal.cx> References: <20160726123140.878340-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160726123140.878340-1-arnd@arndb.de> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jul 26, 2016 at 02:31:29PM +0200, Arnd Bergmann wrote: > The CLOCKSOURCE_OF_DECLARE now takes a function that returns an 'int', but a this > new clocksource driver has just appeared in linux-next and causes a warning because > it has the old 'void' return value: > > In file included from ../include/linux/clocksource.h:18:0, > from ../include/linux/clockchips.h:13, > from ../drivers/clocksource/jcore-pit.c:14: > include/linux/of.h:1006:20: error: comparison of distinct pointer types lacks a cast [-Werror] > .data = (fn == (fn_type)NULL) ? fn : fn } > ^ > > This adapts the jcore_pit_init() function to the correct return type. > > Signed-off-by: Arnd Bergmann > Fixes: e0aa0655c60b ("clocksource: add J-Core timer/clocksource driver") > --- > The patch that introduces the warnign currently only exists in the linux-sh git > tree and showed up in linux-next this week. I've removed the commit from my for-next branch since it's not appropriate to go upstream through my tree. Your patch should still be applied in the proper subsystem tree, though, I think. Daniel? Rich > --- > drivers/clocksource/jcore-pit.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/clocksource/jcore-pit.c b/drivers/clocksource/jcore-pit.c > index 373b9f954a5c..4a2f7803624b 100644 > --- a/drivers/clocksource/jcore-pit.c > +++ b/drivers/clocksource/jcore-pit.c > @@ -154,7 +154,7 @@ static irqreturn_t jcore_timer_interrupt(int irq, void *dev_id) > return IRQ_HANDLED; > } > > -static void __init jcore_pit_init(struct device_node *node) > +static int __init jcore_pit_init(struct device_node *node) > { > int err; > __iomem void *pit_base; > @@ -169,12 +169,14 @@ static void __init jcore_pit_init(struct device_node *node) > pit_base = of_iomap(node, 0); > if (!pit_base) { > pr_err("Error: Cannot map base address for J-Core PIT\n"); > + err = -ENXIO; > goto out; > } > > pit_irq = irq_of_parse_and_map(node, 0); > if (!pit_irq) { > pr_err("Error: J-Core PIT has no IRQ\n"); > + err = -ENXIO; > goto out; > } > > @@ -183,6 +185,7 @@ static void __init jcore_pit_init(struct device_node *node) > cs = kzalloc(sizeof *cs, GFP_KERNEL); > if (!cs) { > pr_err("Failed to allocate memory for clocksource\n"); > + err = ENOMEM; > goto out; > } > jcore_cs = &cs->cs; > @@ -207,12 +210,14 @@ static void __init jcore_pit_init(struct device_node *node) > pit_percpu = alloc_percpu(struct jcore_pit); > if (!pit_percpu) { > pr_err("Failed to allocate memory for clock event device\n"); > + err = ENOMEM; > goto out; > } > > nb = kzalloc(sizeof *nb, GFP_KERNEL); > if (!nb) { > pr_err("Failed to allocate memory for J-Core PIT notifier\n"); > + err = ENOMEM; > goto out; > } > > @@ -268,10 +273,11 @@ static void __init jcore_pit_init(struct device_node *node) > > jcore_pit_local_init(this_cpu_ptr(pit_percpu)); > > - return; > + return 0; > > out: > pr_err("Could not initialize J-Core PIT driver\n"); > + return err; > } > > CLOCKSOURCE_OF_DECLARE(jcore_pit, "jcore,pit", jcore_pit_init); > -- > 2.9.0