From patchwork Fri Jan 27 10:11:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 49156 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp755613wrn; Fri, 27 Jan 2023 02:18:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXtHZQ+KeXoPk/xxav3z00C0sKdPQ2CSOG1wkjOko4jSNk7vUnelgGnAFfzH/q+9v8E9ExFF X-Received: by 2002:a05:6a20:12d1:b0:b8:36a7:c5c5 with SMTP id v17-20020a056a2012d100b000b836a7c5c5mr50154608pzg.27.1674814711301; Fri, 27 Jan 2023 02:18:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674814711; cv=none; d=google.com; s=arc-20160816; b=rnxpbSJ9cYrthIiionU4FPXNG4ZS4X+Lr05+//wbMBgT0REpM1B1iDRjf4RwkF9yhC QiiXcifG2F/2AUT5IRkQ/yM14Kp034HZxHlfoT8qfjeg19Lka/yKz56+HPeqtU8/duek FobCPu6J1wLPSRbrt/apgkg6Fy7ZqnDc/mWuBLiXHmGtKs4ZeafkbkvmpJvDgXde6Ygh XaYQyqZsiTkkvh9k6kGq7xXewzmjZrHW+o/2m6xpiltiJdTwjsLa/ycXtHYFXgBJCW1Y OCdBa5C6YwMrOC3cuHhHf1CmGmwYop9pESYUNVYUYuHI3Lr12zqVyUJoob4qoU/HZ8b3 +qaw== 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=69obudiH0bTfAkqeZ2wOyxII8K2ncxe0hL/9tUtY3jk=; b=MXM2Y163Wly6L9bHOsbqyWZk5TntymT4xwy71GWheI8S6/C8CE5RecK3/1/Ud5LagO JOyMVtz39zy4F3xJW6ElwnN7anv9ejqdZ0By3ghK/Cp5MBjNKLzP6uyYTO6cqg3X5qYx Zfyqsm9HNNJ5r9LRDzea37yf7ROx4ePMj5+2e1U+V8qIhF1tMMDYaz3iqG32Ov1ZQgqc fqE88MKZqRb03KlNQlZBwhGgEY8SU8Sh6ciNej1RGq7SUhAe4Igi3WVzK4b1e0qTjEna BoOMNVkLYxUTM8GvA8iXHA8IR5pcKRFTFC0itJDLtV5n47QvU3KG9RWyeqSLzfxrT5d1 ziag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SNGCJlRq; 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 z124-20020a633382000000b004daa13455ddsi3866342pgz.331.2023.01.27.02.18.18; Fri, 27 Jan 2023 02:18:31 -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=SNGCJlRq; 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 S233421AbjA0KMt (ORCPT + 99 others); Fri, 27 Jan 2023 05:12:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233003AbjA0KMi (ORCPT ); Fri, 27 Jan 2023 05:12:38 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6DDA820D2; Fri, 27 Jan 2023 02:12:24 -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 ams.source.kernel.org (Postfix) with ESMTPS id 36E0AB82008; Fri, 27 Jan 2023 10:12:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C5F5C4339B; Fri, 27 Jan 2023 10:12:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674814341; bh=eaEqmjlD+Lv/FVOK9egayQf0KJ7RibJrGH3i8y4yudc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SNGCJlRq+ynRHKaOuBfF4/yY0L/R36vtOqjmstVT0l/K+lm5+iZY9cmfPQrMyJl9i 2ZV+5qygFmwVphR8s3g/1Ko1Rr6ObqTignm4hKlXt3e5XKNvtpJzvTHyIaWPccZjHD h+SrOdmdgN7ujqOf3o0kRigcoOVM23zx65ZMBT+PgF6M7whCG9iuzsSCk2dTm4bgc7 rZ9hrXR72Pe2MznQDlidRwvv30Jwr+bkOXNAsyZlWtvrJ/f3dpaywNPz89vlqtz9q3 HTxuaPbB9gozwcOBDWQ0kklc0KXsMCkfN4I7+mab2oHpAP2l9SAS+rpYGKWCy+mGZn RqYJjvZmsAKpQ== 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 v2 6/7] gpiolib: split linux/gpio/driver.h out of linux/gpio.h Date: Fri, 27 Jan 2023 11:11:48 +0100 Message-Id: <20230127101149.3475929-7-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?1756170510454493025?= X-GMAIL-MSGID: =?utf-8?q?1756170510454493025?= 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. Reviewed-by: Andy Shevchenko Signed-off-by: Arnd Bergmann 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..bfd97f1b6288 100644 --- a/arch/arm/mach-s3c/s3c64xx.c +++ b/arch/arm/mach-s3c/s3c64xx.c @@ -21,6 +21,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..0c32b08a3a9c 100644 --- a/arch/arm/mach-sa1100/assabet.c +++ b/arch/arm/mach-sa1100/assabet.c @@ -10,6 +10,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 a1271526e489..84bb49939d6e 100644 --- a/include/linux/gpio.h +++ b/include/linux/gpio.h @@ -54,9 +54,7 @@ struct gpio { }; #ifdef CONFIG_GPIOLIB -#include #include -#include /* * "valid" GPIO numbers are nonnegative and may be passed to diff --git a/include/linux/mfd/ucb1x00.h b/include/linux/mfd/ucb1x00.h index 9aed2797d3d5..3ebd7aa9227c 100644 --- a/include/linux/mfd/ucb1x00.h +++ b/include/linux/mfd/ucb1x00.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #define UCB_IO_DATA 0x00