From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 638B9C4740C for ; Mon, 9 Sep 2019 23:00:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2DCA220678 for ; Mon, 9 Sep 2019 23:00:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=onstation.org header.i=@onstation.org header.b="a6YmcW0P" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729911AbfIIXAw (ORCPT ); Mon, 9 Sep 2019 19:00:52 -0400 Received: from onstation.org ([52.200.56.107]:44768 "EHLO onstation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726474AbfIIXAw (ORCPT ); Mon, 9 Sep 2019 19:00:52 -0400 Received: from localhost (c-98-239-145-235.hsd1.wv.comcast.net [98.239.145.235]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: masneyb) by onstation.org (Postfix) with ESMTPSA id 071EA3EECB; Mon, 9 Sep 2019 23:00:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=onstation.org; s=default; t=1568070051; bh=6Kv4KMaygv0KswF7kk/EVVDG9vrBQXD7yG5Bil7Y34A=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=a6YmcW0Ph4LLfgyO3jfVMFR5L6ufv/rzPUTiqRPgQ1puSrzqLxK+fq+ACbZrnbLLP +iVuxSaP2nanO9bD4PA7tWbbZqxpHI4LsocCCxi3Np9LvSjOIbT1vfvpYP1+uY/tkP rDgx16eprx9w9aRwXIqDbBsVXDLBOLzewb1/HHMY= Date: Mon, 9 Sep 2019 19:00:50 -0400 From: Brian Masney To: Arnd Bergmann Cc: Linus Walleij , Bartosz Golaszewski , Masahiro Yamada , Hulk Robot , YueHaibing , Hans Verkuil , Stephen Boyd , Enrico Weigelt , Johan Hovold , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] gpio: fix incorrect merge of linux/gpio/driver.h Message-ID: <20190909230050.GA5181@onstation.org> References: <20190909203512.675822-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190909203512.675822-1-arnd@arndb.de> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 09, 2019 at 10:34:59PM +0200, Arnd Bergmann wrote: > Two otherwise correct patches got merged incorrectly, which leads to > build problems when CONFIG_GPIOLIB is disabled: > > include/linux/gpio/driver.h:722:19: error: static declaration of 'gpiochip_lock_as_irq' follows non-static declaration > static inline int gpiochip_lock_as_irq(struct gpio_chip *chip, > ^ > include/linux/gpio/driver.h:706:5: note: previous declaration is here > int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset); > ^ > include/linux/gpio/driver.h:729:20: error: static declaration of 'gpiochip_unlock_as_irq' follows non-static declaration > static inline void gpiochip_unlock_as_irq(struct gpio_chip *chip, > ^ > include/linux/gpio/driver.h:707:6: note: previous declaration is here > void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset); > > Fixes: 8a6abcd04e4c ("Merge tag 'gpio-v5.4-updates-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel") > Fixes: 9091373ab7ea ("gpio: remove less important #ifdef around declarations") > Fixes: c7663fa2a663 ("gpio: Move gpiochip_lock/unlock_as_irq to gpio/driver.h") > Signed-off-by: Arnd Bergmann Reviewed-by: Brian Masney