From patchwork Thu Jan 26 13:27:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 48648 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp274034wrn; Thu, 26 Jan 2023 05:39:27 -0800 (PST) X-Google-Smtp-Source: AMrXdXsbOoqjD1D5eOJizGFaHXFp4ODGQ+CajljUIgDbS7hrgW2WqFEgrWfk0rtgUDlgbWB66BNU X-Received: by 2002:a17:906:9417:b0:86c:f7ac:71ff with SMTP id q23-20020a170906941700b0086cf7ac71ffmr34604990ejx.10.1674740367210; Thu, 26 Jan 2023 05:39:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674740367; cv=none; d=google.com; s=arc-20160816; b=0MNsL0vf4dVdRY5En4hCundvbzWEFhoHsP9Lahw0l6DuuLjB6halyg5p8curIBLMmo +W8+XpTLxTBjIlh/xzIv+GSU0JnPC9197fuRkLYw+lJite9r5inKEaYK/pmVjH+0AiLa zmY4PqUNQrhkVUQ+cFbp319bXxxtzkYu+nFMdNRbehd1JqWxA/rJ8LTgAUKQK0f/fAwN L0B1VwOIRZSWdctUl6S8CUPr/NwTjRmpX53JxN5hgSBQ9Zr7qLivpj/+2HmI6olnqp80 abDhqH2mbzBjMIk5lltqyzAym34FxJu+5CD7ZxvKxWtezeXApL10ow5mAVyaRVCiPMOK Ua5Q== 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=PzBhRhjZeWQcYAX+6r/fLD5aUSdRJ7J/HqXVYHl9opg=; b=H4Elh0jS8IRdov95UeKfNBqsWsS/pO0AyoriBUHC8COSXLV6H4sXj8sR0rYNuEg45T 4DjEJ5sb2JyiKGmz/w/QOQPoPN78d0FP4TzsH2nwqXlrQFUE5jsB60bA45wJA3cxGToa zprAh80l068Pm6Z9pXBiDTkinozjdXMhiBwWGvUClvXFic7MD1gCNPEQT9MiOWbLBFXY Vyp3C7vYDf5A1b35dbGJNyY80hMddlfu91/jSWE0KQ9bbG2MMUBaZMVxkRNXaWMjdkSF C2zHlksMT36TBHibFZ1NAIpDl6AChp31w+nQT0AZ5rWpfOHatwldYuhgqz2U56B3pi00 WSyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Eb5nAzH5; 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 v17-20020a17090651d100b008697a71e4f0si1213956ejk.811.2023.01.26.05.39.03; Thu, 26 Jan 2023 05:39:27 -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=Eb5nAzH5; 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 S236867AbjAZN2j (ORCPT + 99 others); Thu, 26 Jan 2023 08:28:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236115AbjAZN2g (ORCPT ); Thu, 26 Jan 2023 08:28:36 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B9066EB9; Thu, 26 Jan 2023 05:28:14 -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 sin.source.kernel.org (Postfix) with ESMTPS id 79ECFCE2416; Thu, 26 Jan 2023 13:28:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CEB13C4339B; Thu, 26 Jan 2023 13:28:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674739690; bh=scLxtXK0CI1WUEUBZxfzYBeAu1lVUR2nZItek9RfGPE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Eb5nAzH5T/TxENY0LOEZpwJKWaFDFs0PZZStspdRhY5tM7MU860AMxFSeMO7uAJUb plFmjeuagYwggzS9dvyqahIvfwFr2ig1Rp0firKWIOMzr8HmO98YhI3pVqYlT9DPEg smoLYJM7tdv9lSK1oYz9F26DL4DpOvRGQbtnDOxFwdjTcu4zE40BKqhWCE8ByS5iF5 EXWzWGV1vPaXGB9RPXEoZ/gu4kkU+WwpF7HfTou6Ee8aDC++AVzfE7zj151Y9771Ud LTqFZRgtkmotXLhht80Mx3SwNOHOXbdoIerXVRI1EAMTbOf6+q/dFE3vukbI9hcVAL 6nmeaYPCYiwwg== 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 Subject: [PATCH 1/8] gpiolib: remove empty asm/gpio.h files Date: Thu, 26 Jan 2023 14:27:54 +0100 Message-Id: <20230126132801.2042371-2-arnd@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230126132801.2042371-1-arnd@kernel.org> References: <20230126132801.2042371-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?1756092555081483210?= X-GMAIL-MSGID: =?utf-8?q?1756092555081483210?= 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 Signed-off-by: Arnd Bergmann Acked-by: Bartosz Golaszewski 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 */