From:   Pierluigi Passaro <pierluigi.p@variscite.com>
To:     linus.walleij@linaro.org, brgl@bgdev.pl,
        yamada.masahiro@socionext.com, linux-gpio@vger.kernel.org,
        linux-kernel@vger.kernel.org, sfr@canb.auug.org.au
Cc:     eran.m@variscite.com, nate.d@variscite.com,
        francesco.f@variscite.com, pierluigi.passaro@gmail.com,
        Pierluigi Passaro <pierluigi.p@variscite.com>,
        kernel test robot <lkp@intel.com>
Subject: [PATCH v3] gpiolib: fix linker errors when GPIOLIB is disabled
Date:   Tue, 24 Jan 2023 02:31:38 +0100
Message-Id: <20230124013138.358595-1-pierluigi.p@variscite.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VUjUtihWry8W+oL4zHCCjOy4dhGWWQo6sHWTpqfSXcV/i2jNwFBL5h+32ecs?=
 =?us-ascii?Q?aFlo2N3NG2sOc5PUyoECS1Se66lB3v54PutXCaVc7AjKuxIWGkfMX4Nx/UYQ?=
 =?us-ascii?Q?h7aSya1r90ajoDDN+2q3uhADx5YvRPkJ0zaNfw0wz2UxAN09s8kZkziZ572p?=
 =?us-ascii?Q?39M2dTvUOSiC8GBI1FiJzg3RA3tuiep7XJqlFO27ZlkgZOdEA5NSnDljn7oo?=
 =?us-ascii?Q?3aIWsEzdrBGOWgHNsbY0ijLDt2DebcRHvf3/ibo9hI/M002iyMS0C+7sxNV4?=
 =?us-ascii?Q?YYJeiJA5S5U0FtRLndmdIksDlCFdyHXxcq00W9cZwEHn97F35jIHBagbL3Nw?=
 =?us-ascii?Q?Lg+ktjmlNGoWYCQD75Y0rY4n0ZFEglEl4CFn/HtiQQ8OAiUDU9reEeA8s7gY?=
 =?us-ascii?Q?3Yx18ASGErdjZpvyQbwVjdRmbH8a0398oVqO9ERkZIjZDUjsbmydMvj/YQC7?=
 =?us-ascii?Q?3NxbOrgscWOWibh3qisZKRAz7CAauA92dBVcc05+kofu+/Kg84GojMk+RNiq?=
 =?us-ascii?Q?FY0egVYxclfgkkwElZHeFE+n+acwC1LFaNC0vFgijEAO6yKgcZll/kTWJKFj?=
 =?us-ascii?Q?h3uZzRiUKxeyJW3vX2p0HS2KcpbbIMj/3mp6osWLGzvms7gjJDWNBpBT42Nd?=
 =?us-ascii?Q?x/mTWviXILwr/MBRIU7uR3lE831HiWneD96gGgN1ML+jdkJVgHLFdS9cYygR?=
 =?us-ascii?Q?w9e2VdpQJXsSGJi/LfqtEjPE5oUgtb3yrzHHPOtKVqN3v53t13QOIMFjR1+l?=
 =?us-ascii?Q?jePqM3qisVf2SkpHyVf60Kfe89qHylWSQtCK/jJiHBVsOtzXOWj//duzNLUN?=
 =?us-ascii?Q?hC00okK4+vJRFul6o8OBzeRUDXwFbTMadadyp2T2DcvE9FFN97A2kGZvfHoh?=
 =?us-ascii?Q?b8I6IdAmQ78CPZcZgVMvM8qL6/yk7CaH77z277fX4JslK9bstOiaV1xaVSjG?=
 =?us-ascii?Q?twDBQUqpH4YBg7ERG8Hy666pa0bv6+PeQvWggZu9nzT80k1hGc1XbstVq0oW?=
 =?us-ascii?Q?l32jslmU0R/5ckJIjrA+gOUXPYtWqvJ4YJVyO8JQaVErr4iUGlobdWykug7W?=
 =?us-ascii?Q?7B3z9pAVY84AsFXsxVaVcnhBmyoCPoP3+4g60cKdUuMVKsidn2zsPcil3xW6?=
 =?us-ascii?Q?TCYL6Mwm7/EXARCi3Gv90LmxZtLYMvlJNFIa3UVzGRuR1N8DSuUP1Yj/4Ruw?=
 =?us-ascii?Q?v0T9h+ZwBn3jXl7oSs37VIXeN28naKrx//XLwoDW0F2oUVQhmYHVS2m1vW3Y?=
 =?us-ascii?Q?b3pTGZ1KGLWW+wps0pnv9r78N3zC3dxr++hRYugIPPIOiEzUw9ezynH9LHjI?=
 =?us-ascii?Q?CIuccExj/T6Rh8qX/yg3sFOBVMIrR3NPcpp8jE0vBFAOhE/Pz/9GP4CzCZYh?=
 =?us-ascii?Q?AA69pOR8pPltYWKhWEZScsjDL4PHznqicMTGR6QdNA9hBla1Xk8gaHJ3YAwY?=
 =?us-ascii?Q?An+AafmyyaFbbjRsmkNDW6Km3qjon4E3i4j69coDnknVBfQ4xuFSDIgCwqZm?=
 =?us-ascii?Q?kyl7qamA2f2SEYiqnI+1zXFAOCmfppiAT43oI+gGnKSKYh2A5ObcwmApvf3L?=
 =?us-ascii?Q?AodSGwq+1p2A1blyRgup4FCWZMWufykaeBz8hvp9A8Co+eaHS4HRsHDgqMUU?=
 =?us-ascii?Q?og=3D=3D?=
X-OriginatorOrg: variscite.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 04e2e45f-6dc7-42a4-4f94-08dafdaac240
X-MS-Exchange-CrossTenant-AuthSource: AM6PR08MB4376.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 01:31:47.3327
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 399ae6ac-38f4-4ef0-94a8-440b0ad581de
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: jK54Iuu0a5Xua9nP3IpVqiSn9JMNbDJ5YXv2Ok3+xeY4eQIy3N5ApAPkv6ytCgbw37EQUZukg9ZFnQef+8b3f4z6/xetW9BSpFfxBM+ik04=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAVPR08MB9484
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Both the functions gpiochip_request_own_desc and
gpiochip_free_own_desc are exported from
    drivers/gpio/gpiolib.c
but this file is compiled only when CONFIG_GPIOLIB is enabled.
Move the prototypes under "#ifdef CONFIG_GPIOLIB" and provide
reasonable definitions and includes in the "#else" branch.

Fixes: 9091373ab7ea ("gpio: remove less important #ifdef around declarations")
Signed-off-by: Pierluigi Passaro <pierluigi.p@variscite.com>
Reported-by: kernel test robot <lkp@intel.com>
---
Changes in v2:
- add Fixes tag
Changes in v3:
- add includes to fix builds against x86_64-defconfig

 include/linux/gpio/driver.h | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index 44783fc16125..e00eaba724dc 100644
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -758,6 +758,8 @@ gpiochip_remove_pin_ranges(struct gpio_chip *gc)
 
 #endif /* CONFIG_PINCTRL */
 
+#ifdef CONFIG_GPIOLIB
+
 struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *gc,
 					    unsigned int hwnum,
 					    const char *label,
@@ -765,8 +767,6 @@ struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *gc,
 					    enum gpiod_flags dflags);
 void gpiochip_free_own_desc(struct gpio_desc *desc);
 
-#ifdef CONFIG_GPIOLIB
-
 /* lock/unlock as IRQ */
 int gpiochip_lock_as_irq(struct gpio_chip *gc, unsigned int offset);
 void gpiochip_unlock_as_irq(struct gpio_chip *gc, unsigned int offset);
@@ -776,6 +776,25 @@ struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc);
 
 #else /* CONFIG_GPIOLIB */
 
+#include <linux/gpio/machine.h>
+#include <linux/gpio/consumer.h>
+
+static inline struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *gc,
+					    unsigned int hwnum,
+					    const char *label,
+					    enum gpio_lookup_flags lflags,
+					    enum gpiod_flags dflags)
+{
+	/* GPIO can never have been requested */
+	WARN_ON(1);
+	return ERR_PTR(-ENODEV);
+}
+
+static inline void gpiochip_free_own_desc(struct gpio_desc *desc)
+{
+	WARN_ON(1);
+}
+
 static inline struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc)
 {
 	/* GPIO can never have been requested */
-- 
2.34.1