From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933010AbdBHIuC (ORCPT ); Wed, 8 Feb 2017 03:50:02 -0500 Received: from mail-wm0-f48.google.com ([74.125.82.48]:34901 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932954AbdBHIs5 (ORCPT ); Wed, 8 Feb 2017 03:48:57 -0500 Date: Wed, 8 Feb 2017 08:48:54 +0000 From: Lee Jones To: Stephen Rothwell Cc: Linus Walleij , Greg KH , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Boris Brezillon , Alexander Stein , Andy Shevchenko Subject: Re: linux-next: build failure after merge of the gpio tree Message-ID: <20170208084854.qrxnbrtdnbxefwpg@dell> References: <20170208161113.1b597c01@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170208161113.1b597c01@canb.auug.org.au> User-Agent: Mutt/1.6.2-neo (2016-08-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 08 Feb 2017, Stephen Rothwell wrote: > Hi Linus, I believe this patch would need to go in via Greg's tree. (see below) > After merging the gpio tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > drivers/tty/serial/st-asc.c: In function 'asc_set_termios': > drivers/tty/serial/st-asc.c:578:12: error: implicit declaration of function 'devm_get_gpiod_from_child' [-Werror=implicit-function-declaration] > gpiod = devm_get_gpiod_from_child(port->dev, "rts", > ^ > drivers/tty/serial/st-asc.c:578:10: warning: assignment makes pointer from integer without a cast [-Wint-conversion] > gpiod = devm_get_gpiod_from_child(port->dev, "rts", > ^ > > Caused by commits > > a264d10ff45c ("gpiolib: Convert fwnode_get_named_gpiod() to configure GPIO") > b2987d7438e0 ("gpio: Pass GPIO label down to gpiod_request") > 4b0947974e59 ("gpio: Rename devm_get_gpiod_from_child()") > > interacting with commit > > d7356256488c ("serial: st-asc: (De)Register GPIOD and swap Pinctrl profiles") > > from the tty tree. > > I applied the following merge fix patch (I guessed about the new arguments): > > From: Stephen Rothwell > Date: Wed, 8 Feb 2017 15:50:22 +1100 > Subject: [PATCH] serial: st-asc: merge fix for devm_get_gpiod_from_child rename > > Signed-off-by: Stephen Rothwell > --- > drivers/tty/serial/st-asc.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c > index bcf1d33e6ffe..c02e6b089364 100644 > --- a/drivers/tty/serial/st-asc.c > +++ b/drivers/tty/serial/st-asc.c > @@ -575,8 +575,11 @@ static void asc_set_termios(struct uart_port *port, struct ktermios *termios, > pinctrl_select_state(ascport->pinctrl, > ascport->states[NO_HW_FLOWCTRL]); > > - gpiod = devm_get_gpiod_from_child(port->dev, "rts", > - &np->fwnode); > + gpiod = devm_fwnode_get_gpiod_from_child(port->dev, > + "rts", > + &np->fwnode, > + GPIOD_IN, GPIOD_OUT > + np->name); > if (!IS_ERR(gpiod)) { > gpiod_direction_output(gpiod, 0); > ascport->rts = gpiod; -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog