From patchwork Wed Jan 25 20:10:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 646769 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D460C27C76 for ; Wed, 25 Jan 2023 20:11:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236326AbjAYULu (ORCPT ); Wed, 25 Jan 2023 15:11:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236317AbjAYULo (ORCPT ); Wed, 25 Jan 2023 15:11:44 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D452C5CFEB; Wed, 25 Jan 2023 12:11:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674677474; x=1706213474; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TmiJH7yegRFkVHybG0Js6InCkhSr5S2J1lLVxKNHjiI=; b=dbep2eBvwm7ZqcXWwPw19rxb0/7bTwj5J4heOWNaccelawDkaoDdkxY+ rxLLF1M+1juO/eH/MgO2BAPT4RuxbvLuJIs/gRDAsM6sNvVhOAuBKLcIE oyOd3SKynaSArw2jZ9sSAibHDNWojvfF8Y0dY5Low6wMm53KR/+NwcNYg n+zHucbxgYmCWxQ4G9IOEM4Tn8DkM+izV6szXD/yVdJeiAJjTT56LCdTc lhVnZ+uSIo6SJ5WpTiQzyfT37RJLmn5MmtLx+m/Orz41/144/KyGKIdA3 eRpnO5u/Skeo4Dcst3cO9X2SaEDXMona3G2OKfFIKqJ32ijRNP+Q6KRUz g==; X-IronPort-AV: E=McAfee;i="6500,9779,10601"; a="326694781" X-IronPort-AV: E=Sophos;i="5.97,246,1669104000"; d="scan'208";a="326694781" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jan 2023 12:09:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10601"; a="770871613" X-IronPort-AV: E=Sophos;i="5.97,246,1669104000"; d="scan'208";a="770871613" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 25 Jan 2023 12:09:49 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 4A87A1F0; Wed, 25 Jan 2023 22:10:25 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Bartosz Golaszewski , Christophe Leroy , Dmitry Torokhov , linux-gpio@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Walleij , Bartosz Golaszewski , Arnd Bergmann Subject: [PATCH v1 3/5] gpio: Deduplicate forward declarations in consumer.h Date: Wed, 25 Jan 2023 22:10:18 +0200 Message-Id: <20230125201020.10948-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230125201020.10948-1-andriy.shevchenko@linux.intel.com> References: <20230125201020.10948-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The struct fwnode_handle pointer is used in both branches of ifdeffery, no need to have a copy of the same in each of them, just make it global. Signed-off-by: Andy Shevchenko --- include/linux/gpio/consumer.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h index 59cb20cfac3d..a7eb8aa1e54c 100644 --- a/include/linux/gpio/consumer.h +++ b/include/linux/gpio/consumer.h @@ -8,6 +8,7 @@ #include struct device; +struct fwnode_handle; struct gpio_desc; struct gpio_array; @@ -171,9 +172,6 @@ int gpiod_set_consumer_name(struct gpio_desc *desc, const char *name); struct gpio_desc *gpio_to_desc(unsigned gpio); int desc_to_gpio(const struct gpio_desc *desc); -/* Child properties interface */ -struct fwnode_handle; - struct gpio_desc *fwnode_gpiod_get_index(struct fwnode_handle *fwnode, const char *con_id, int index, enum gpiod_flags flags, @@ -546,9 +544,6 @@ static inline int desc_to_gpio(const struct gpio_desc *desc) return -EINVAL; } -/* Child properties interface */ -struct fwnode_handle; - static inline struct gpio_desc *fwnode_gpiod_get_index(struct fwnode_handle *fwnode, const char *con_id, int index,