From patchwork Fri Jan 27 10:11:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 49150 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp755186wrn; Fri, 27 Jan 2023 02:17:21 -0800 (PST) X-Google-Smtp-Source: AMrXdXvxlMDaBUS9uSP4fD5lm61CcOk3LM1iPjJ0orR9yJCpVlInGgCbQdkSW5QtfgdVPFniSHzx X-Received: by 2002:a05:6a20:4407:b0:ac:16ae:f46 with SMTP id ce7-20020a056a20440700b000ac16ae0f46mr55385952pzb.15.1674814641654; Fri, 27 Jan 2023 02:17:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674814641; cv=none; d=google.com; s=arc-20160816; b=n164LFLOZaFnLWVreqHxBB69zTs3EOZrjaJgt6PHQ4K8Ppv0tDcSjF7Tlq1P2pYYUy Bwy51NRFkDDdVGNqAOzM8pNUbYRCm5cxWAvI1oh0mxhcPKINjcRljnASBx+k8xuJh/Gg ik9yzj0Bka7sPmTYx8iGiHXG2MdEs8IO7RiT/xalOMf803n4Itb5y8coJOcWYEvEzgMW CvjgttHLD/ADr0Pc8+jDfR4KkvFcOC59DQon/QMtdyfszML88SJYBIEH+mW32KUilkvC JycKjEkc5+Qr5oQ+hiRRQP9FOUA7j83nHcLeRjoP+urdSbeKwEIx4BOVTAQVFCezUTdo DuVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ukdtxrN7+aWqEr8LCA/LxwFG3lxx6BnY7a35lM0jdps=; b=hLv4+HxWQRbsccx621LKD3Ueb7676C/A9nNUfUo9U+k6ez3eK+lJD7YOH17FqlSXRm wuP2HGkAK730Pb6FjnnsROPpDseZG5ahKI7a4b4L+6K/OfobSr21uYHhuPBxjZXzhYnD NbhRMMlcrAFHZQAfyu+d1r00B256wF3jTlw6Z3eMkvqCbiopvsBCdPvc/W6F/pI7Vdy2 H4vUrOY1XC6CP0Wqh1PYpg2zmzzICvhKLTHf70d7M68guocDeYjGiUeeRytDQp04NTr2 fb/l9P4aalWQ9bC3/ZJpmWiBuc96WHBxqqPrkcSdK1Baz9rGcVLT4l/ipEKJRyFrrpE5 8lXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="l/lmYw3E"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v15-20020a63bf0f000000b004d0ef90d860si4158665pgf.297.2023.01.27.02.17.07; Fri, 27 Jan 2023 02:17:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="l/lmYw3E"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233379AbjA0KMO (ORCPT + 99 others); Fri, 27 Jan 2023 05:12:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230484AbjA0KMM (ORCPT ); Fri, 27 Jan 2023 05:12:12 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A07F4DBD6; Fri, 27 Jan 2023 02:12:11 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id AC67161AAF; Fri, 27 Jan 2023 10:12:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E65FAC4339B; Fri, 27 Jan 2023 10:12:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674814330; bh=4dQ7nHYJ98q19ZMod1DMiWnCXOcE2qsLTAcpzyaMqNI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l/lmYw3EZMVe5BhkZEN2SJuE3xNgUAmzb24vOBLmHt20I6lyZGaDuYjfnpTsgZR9e UIVHM0INLHukfZBRgs/B3hmXJANuQobI/Zu2PxzCip+Bh3u2gHWsLZis3gXJLMg8Rw bvCoK9THT0i3osELPS1r+7SnPLG51bLMieKQVQWjhHlU8ei0K+g76siil/Q8Co+tsW YP/cj/Lq4bbPmaFG3HEQSWLVl6BjvRP0wTqZdWR73D8vw7n4AJMgFYZyu3411+Imfz vePnibJEBhi/hXRm6gvM17ikEpIYwosYpJVq/cq9j94xEzBT7ZADU7FOkmx+sO3fdn 3ilv7QBPG/hrQ== From: Arnd Bergmann To: linux-gpio@vger.kernel.org Cc: Arnd Bergmann , Andy Shevchenko , Bartosz Golaszewski , Christophe Leroy , Dmitry Torokhov , Linus Walleij , linux-kernel@vger.kernel.org, Geert Uytterhoeven , Bartosz Golaszewski Subject: [PATCH v2 1/7] gpiolib: remove empty asm/gpio.h files Date: Fri, 27 Jan 2023 11:11:43 +0100 Message-Id: <20230127101149.3475929-2-arnd@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230127101149.3475929-1-arnd@kernel.org> References: <20230127101149.3475929-1-arnd@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756170437425773822?= X-GMAIL-MSGID: =?utf-8?q?1756170437425773822?= From: Arnd Bergmann The arm and sh versions of this file are identical to the generic versions and can just be removed. The drivers that actually use the sh3 specific version also include cpu/gpio.h directly, with the exception of magicpanelr2, which is easily fixed. This leaves coldfire as the only gpio driver that needs something custom for gpiolib. Reviewed-by: Geert Uytterhoeven Reviewed-by: Andy Shevchenko Acked-by: Bartosz Golaszewski Signed-off-by: Arnd Bergmann Reviewed-by: Linus Walleij --- arch/arm/Kconfig | 1 - arch/arm/include/asm/gpio.h | 21 -------------- arch/sh/Kconfig | 1 - arch/sh/boards/board-magicpanelr2.c | 1 + arch/sh/include/asm/gpio.h | 45 ----------------------------- 5 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 arch/arm/include/asm/gpio.h delete mode 100644 arch/sh/include/asm/gpio.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5c8bab8d6009..b4447a055029 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -24,7 +24,6 @@ config ARM select ARCH_HAS_SYNC_DMA_FOR_CPU select ARCH_HAS_TEARDOWN_DMA_OPS if MMU select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST - select ARCH_HAVE_CUSTOM_GPIO_H select ARCH_HAVE_NMI_SAFE_CMPXCHG if CPU_LDREX select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_KEEP_MEMBLOCK diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h deleted file mode 100644 index 4ebbb58f06ea..000000000000 --- a/arch/arm/include/asm/gpio.h +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ARCH_ARM_GPIO_H -#define _ARCH_ARM_GPIO_H - -#include - -/* The trivial gpiolib dispatchers */ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep - -/* - * Provide a default gpio_to_irq() which should satisfy every case. - * However, some platforms want to do this differently, so allow them - * to override it. - */ -#ifndef gpio_to_irq -#define gpio_to_irq __gpio_to_irq -#endif - -#endif /* _ARCH_ARM_GPIO_H */ diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 0665ac0add0b..ccb866750a88 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -4,7 +4,6 @@ config SUPERH select ARCH_32BIT_OFF_T select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM && MMU select ARCH_ENABLE_MEMORY_HOTREMOVE if SPARSEMEM && MMU - select ARCH_HAVE_CUSTOM_GPIO_H select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A) select ARCH_HAS_BINFMT_FLAT if !MMU select ARCH_HAS_CURRENT_STACK_POINTER diff --git a/arch/sh/boards/board-magicpanelr2.c b/arch/sh/boards/board-magicpanelr2.c index c3434f0ffc7d..626c716c086c 100644 --- a/arch/sh/boards/board-magicpanelr2.c +++ b/arch/sh/boards/board-magicpanelr2.c @@ -21,6 +21,7 @@ #include #include #include +#include #include /* Dummy supplies, where voltage doesn't matter */ diff --git a/arch/sh/include/asm/gpio.h b/arch/sh/include/asm/gpio.h deleted file mode 100644 index 588c1380e4cb..000000000000 --- a/arch/sh/include/asm/gpio.h +++ /dev/null @@ -1,45 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 - * - * include/asm-sh/gpio.h - * - * Generic GPIO API and pinmux table support for SuperH. - * - * Copyright (c) 2008 Magnus Damm - */ -#ifndef __ASM_SH_GPIO_H -#define __ASM_SH_GPIO_H - -#include -#include - -#if defined(CONFIG_CPU_SH3) -#include -#endif - -#include - -#ifdef CONFIG_GPIOLIB - -static inline int gpio_get_value(unsigned gpio) -{ - return __gpio_get_value(gpio); -} - -static inline void gpio_set_value(unsigned gpio, int value) -{ - __gpio_set_value(gpio, value); -} - -static inline int gpio_cansleep(unsigned gpio) -{ - return __gpio_cansleep(gpio); -} - -static inline int gpio_to_irq(unsigned gpio) -{ - return __gpio_to_irq(gpio); -} - -#endif /* CONFIG_GPIOLIB */ - -#endif /* __ASM_SH_GPIO_H */