From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753494AbdBHFS3 (ORCPT ); Wed, 8 Feb 2017 00:18:29 -0500 Received: from ozlabs.org ([103.22.144.67]:50283 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752924AbdBHFS0 (ORCPT ); Wed, 8 Feb 2017 00:18:26 -0500 Date: Wed, 8 Feb 2017 16:11:13 +1100 From: Stephen Rothwell To: Linus Walleij , Greg KH Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Lee Jones , Boris Brezillon , Alexander Stein , Andy Shevchenko Subject: linux-next: build failure after merge of the gpio tree Message-ID: <20170208161113.1b597c01@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, 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, + np->name); if (!IS_ERR(gpiod)) { gpiod_direction_output(gpiod, 0); ascport->rts = gpiod; -- 2.10.2 -- Cheers, Stephen Rothwell