From patchwork Thu Jan 26 13:27:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 48650 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp274284wrn; Thu, 26 Jan 2023 05:40:04 -0800 (PST) X-Google-Smtp-Source: AMrXdXt9waYIdSMwaJ4PVfz0DBfuWQ8WnFRdMoYn7vqT/a6+hvWTsak6y9eEdEq+gaEnVjHZD0Bu X-Received: by 2002:a17:906:5214:b0:7c0:f2c5:ac3d with SMTP id g20-20020a170906521400b007c0f2c5ac3dmr34644602ejm.15.1674740404194; Thu, 26 Jan 2023 05:40:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674740404; cv=none; d=google.com; s=arc-20160816; b=woREclyBmGOuSEf1EtTQw/Xo6UNdwzvWBWdyDA2lXXMy3l+9ZzQCr7kbeW3nMTY5Ko hUfWY7X5I63tgoRje/CgzLyff8HY7B0Xi5ObXsOgXWdTlAe9Ebgce4tBB/cGDrvVRSyH 0nfaXbEeNNnhHix5QidGya2IrRv8aHSz+yJ6+BIb/OY5KIBnIbIddoKdl81lChkHuOXn O8+ypWBJ5qEGX1FJjMLKnaa94yqxOnscI5EJuvUniWJtDxGn0PbTzvKgZJ1Neya+MRTC gy5auoywPmS0yN40MDIPAD5uR/Yjw7TNqvBM60vydnVoEW75Tbjp6V1YfXSdfH/RnrgU VcXg== 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=3i7d0d23WQ8YHYBgvzw3njtWiR/9/VCXnkgzJpquPmE=; b=lOXb1IBCLfr5rY2DdQRzfHiUVpb1MSrPD06D8AnglQVqnDad4VqFq2d61KYF7OqPRS YgCHdzcN2JifJPe7tS0GSOvSx5JFixiEc+V5k9sglz7X6CSXUXbzCZflctbBjHSJ4eKE t1ownzIcFB+uA3CUebk4FREX76aPBRp3Jsgf7fKBTaRWbeGlinhBCqwcFyR8T0aHb4UT WGZEjZL4j/yhdbM/9GSftp7RHgrHH91agrOcq1oyQVEE9K2YuDwfSUUn7kWnBFD+KZTX 3R48jzRyNBKd9pdduzu2PM+oGRyTK6DptwE7WO3z2jRJWeHAxWkPY84wV2jUI3zKrGxx lx+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QO2veeVy; 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 21-20020a170906101500b0086a16d93ef4si1336857ejm.119.2023.01.26.05.39.40; Thu, 26 Jan 2023 05:40:04 -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=QO2veeVy; 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 S236946AbjAZN2y (ORCPT + 99 others); Thu, 26 Jan 2023 08:28:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236115AbjAZN2k (ORCPT ); Thu, 26 Jan 2023 08:28:40 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38DC865BD; Thu, 26 Jan 2023 05:28:23 -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 C6EC7617D5; Thu, 26 Jan 2023 13:28:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64426C433EF; Thu, 26 Jan 2023 13:28:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674739702; bh=jxcMnfhyxChs+Qs+/oO6mhoGvEOqz9EkwgWaoWZcekc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QO2veeVyvDxgGnxxwYXJr3Q/tu2KFGf/XIsPHVlblFXE4ix9fdAKBiOly0Akp9H6p dbZGEPUknC6YcBk12pPknWw0vmv09Q9eaCRX7eUWiAU5COeL5MMNFYR74/3Cvg0E+O DQPGJcoeUW39blFCliWBc8DVK/S+jFMenvp4PDisWOzxw+KaEZ9GsxV/OTq845SxUD E/EnFmJl/IBqYi7VFgHq3WQ7qq4oTSFjbdlEk8gP3/JE5oiAbKSBHN9JwUJYfD/tDG /0+T+qAJXfDeW2QPFZuUddvM7WKAl5z80DZlqpdRDBlP1ABToomwIztzo4kscITGp2 ngMcqZH456JLw== 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 Subject: [PATCH 6/8] gpiolib: split linux/gpio/driver.h out of linux/gpio.h Date: Thu, 26 Jan 2023 14:27:59 +0100 Message-Id: <20230126132801.2042371-7-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?1756092593727228939?= X-GMAIL-MSGID: =?utf-8?q?1756092593727228939?= From: Arnd Bergmann Almost all gpio drivers include linux/gpio/driver.h, and other files should not rely on includes from this header. Remove the indirect include from here and include the correct headers directly from where they are used. Signed-off-by: Arnd Bergmann Reviewed-by: Andy Shevchenko Reviewed-by: Linus Walleij --- arch/arm/mach-omap1/irq.c | 1 + arch/arm/mach-orion5x/board-rd88f5182.c | 1 + arch/arm/mach-s3c/s3c64xx.c | 1 + arch/arm/mach-sa1100/assabet.c | 1 + arch/arm/plat-orion/gpio.c | 1 + drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c | 1 + include/linux/gpio.h | 2 -- include/linux/mfd/ucb1x00.h | 1 + 8 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c index 9ccc784fd614..bfc7ab010ae2 100644 --- a/arch/arm/mach-omap1/irq.c +++ b/arch/arm/mach-omap1/irq.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include diff --git a/arch/arm/mach-orion5x/board-rd88f5182.c b/arch/arm/mach-orion5x/board-rd88f5182.c index 596601367989..1c14e49a90a6 100644 --- a/arch/arm/mach-orion5x/board-rd88f5182.c +++ b/arch/arm/mach-orion5x/board-rd88f5182.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-s3c/s3c64xx.c b/arch/arm/mach-s3c/s3c64xx.c index c20163e6a8b4..c5aa4d8ed8bd 100644 --- a/arch/arm/mach-s3c/s3c64xx.c +++ b/arch/arm/mach-s3c/s3c64xx.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c index 04f8a1680bc1..06e7b1358226 100644 --- a/arch/arm/mach-sa1100/assabet.c +++ b/arch/arm/mach-sa1100/assabet.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c index 3ef9ecdd6343..4946d8066f6a 100644 --- a/arch/arm/plat-orion/gpio.c +++ b/arch/arm/plat-orion/gpio.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c index 9540a05247c2..89c8829528c2 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include #include +#include #include #include #include diff --git a/include/linux/gpio.h b/include/linux/gpio.h index 57ec3975b656..06a33339994e 100644 --- a/include/linux/gpio.h +++ b/include/linux/gpio.h @@ -54,8 +54,6 @@ struct gpio { }; #ifdef CONFIG_GPIOLIB -#include -#include #include /* diff --git a/include/linux/mfd/ucb1x00.h b/include/linux/mfd/ucb1x00.h index 9aed2797d3d5..2e65354fc7b8 100644 --- a/include/linux/mfd/ucb1x00.h +++ b/include/linux/mfd/ucb1x00.h @@ -9,6 +9,7 @@ #include #include +#include #include #include