From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751746AbbHLXCv (ORCPT ); Wed, 12 Aug 2015 19:02:51 -0400 Received: from ozlabs.org ([103.22.144.67]:60721 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750811AbbHLXCu convert rfc822-to-8bit (ORCPT ); Wed, 12 Aug 2015 19:02:50 -0400 Date: Thu, 13 Aug 2015 09:02:48 +1000 From: Stephen Rothwell To: Uwe =?UTF-8?B?S2xlaW5lLUvDtm5pZw==?= Cc: Linus Walleij , Chanwoo Choi , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Roger Quadros Subject: Re: linux-next: build failure after merge of the gpio tree Message-ID: <20150813090248.5fa3441f@canb.auug.org.au> In-Reply-To: <20150812201642.GW9999@pengutronix.de> References: <20150812181045.0d290caa@canb.auug.org.au> <20150812201642.GW9999@pengutronix.de> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 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 Hi Uwe, On Wed, 12 Aug 2015 22:16:42 +0200 Uwe Kleine-König wrote: > > On Wed, Aug 12, 2015 at 06:10:45PM +1000, Stephen Rothwell wrote: > > After merging the gpio tree, today's linux-next build (powerpc > > allyesconfig) failed like this: > > > > drivers/extcon/extcon-palmas.c:211:25: error: too few arguments to function 'devm_gpiod_get_optional' > > palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id"); > > ^ > > In file included from /home/sfr/next/next/include/asm-generic/gpio.h:13:0, > > from /home/sfr/next/next/include/linux/gpio.h:51, > > from /home/sfr/next/next/include/linux/of_gpio.h:20, > > from /home/sfr/next/next/include/linux/mfd/palmas.h:24, > > from /home/sfr/next/next/drivers/extcon/extcon-palmas.c:28: > > /home/sfr/next/next/include/linux/gpio/consumer.h:80:32: note: declared here > > struct gpio_desc *__must_check devm_gpiod_get_optional(struct device *dev, > > ^ > > > > Caused by commit > > > > b17d1bf16cc7 ("gpio: make flags mandatory for gpiod_get functions") > > > > interacting with commit > > > > 92b7cb5dc885 ("extcon: palmas: Support GPIO based USB ID detection") > that commit is not correct. After > > palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id"); > > it does > > palmas_usb->gpio_id_irq = gpiod_to_irq(palmas_usb->id_gpiod); > > without setting the gpio to input. So the right fix is not to add > GPIOD_ASIS but GPIOD_IN. OK, I have fixed my merge fix patch, but can you submit a correct patch to the extcon tree maintainer, please? I assume it can be fixed in that tree right now, right? -- Cheers, Stephen Rothwell sfr@canb.auug.org.au