From patchwork Mon Jul 17 22:54:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 13318296 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B44EBEB64DA for ; Wed, 19 Jul 2023 06:11:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=EE2b6G27Z9mazToIQ9slj65a+soeg/+b1jzzrQNe9xk=; b=NeShvvsUODiEQ2 LVNp1e3QE954JvcK6vadH5Xox88yyDvyaJAAhen4OgAkHtjFh3Q6e5/Me8czpOIxAixsIDNzkzKPE TK5bTpDRHbGsBFL3fz35CjBzOIRxt1f+IJ5VE8phiC9A6lyZsm7lZjtwlJWL3hOSBtxMOk5ZdODYd +kUiLu9vHtP0gzLTPekAEU0H4mPFk5TXVVrQsm2ZQGpKSv++KggZdP6Od4O5akYFyoOXSvddal805 66L97msTpDeYFbHgXx9L72SLPfEzAc80WrDFXm7H1SlcAiCf50K0KA3Xi8CNjxPUmGEM0NDzS0r/L y9zUyWc6MJJlZWrRVbOg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qM0PE-005aX6-24; Wed, 19 Jul 2023 06:11:24 +0000 Received: from desiato.infradead.org ([90.155.92.199]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qM0PD-005aWL-1s for linux-arm-kernel@bombadil.infradead.org; Wed, 19 Jul 2023 06:11:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=ymYn/x+gFr9Uap3Oyjl6lqOUE5lXkOjex1xFd1KzXoo=; b=FBJz2U0sUiQePC9YRSjGnctry8 HNYMRTSexcvqm+Owxtx1ceyCl45BhSwIekL3T/OKMocoi/PI1e3mn8ALYqWs9JIna4Ebdht9g1ac+ hUcxoZjrtgFjhc92j53WEt0O6gsNBSWBVXbr7KWU8hYnRwLHvJGjTk/AdwxMMASSnXZElHVeUcPaG VI+N1XwTFZ/Aogx9aoQFXb2y7xqdUxlKd0XN3iDKuhQjciA6gnq7hRAB/51qXxbFZB63bALbLrZkC e8KiRWR1RPIPPIUG12F5MOyyUzGCX+o4H3Iq27nZ3qeyCNyC9IyTdTH9GckGiBToCOAZx3EmMAn08 oDU0wwGw==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qLXGd-009RHI-19 for linux-arm-kernel@lists.infradead.org; Mon, 17 Jul 2023 23:07:29 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C722661328; Mon, 17 Jul 2023 22:59:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EBBBC433C8; Mon, 17 Jul 2023 22:59:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689634797; bh=f4dpWd1j2PaSct6KkkWMV6D3aNGQhrnp1Irz3n7TOxo=; h=From:To:Cc:Subject:Date:From; b=ZF/V9Rh76Uvzf5bLkDsX24rckkexgIKjmNcJnH6XqXWX18l5UZpOgWdjNDld3qNBU u67beRicWG5tR1H4XZxwfWEJXLYGQKGvG+75ud2Kgwk/B0YeCtLBckRZl2zB/x5ypz wsJzgOZymTf5njooRRc9XAizbOg4vK/gYEaFb8z0XKE+TMQgfrBbwnJwpIZQpiMHt6 HvFDKAq+h+59nFh9HWF9pjQuqkLj0UCN7rXnv5eH0YVnDGC1rnwvQmBelALxuF/E2m oy+04VYNVQQuBJxBEYPreftMWNQ9ELMpV2iy3D0D50sfz4zmznMPsbUzLFatEMsLZT /JI0Fq/8r4/Sg== Received: (nullmailer pid 3211975 invoked by uid 1000); Mon, 17 Jul 2023 22:54:54 -0000 From: Rob Herring To: Tony Lindgren , Russell King Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: omap2: Explicitly include correct DT includes Date: Mon, 17 Jul 2023 16:54:52 -0600 Message-Id: <20230717225452.3211901-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230718_000702_939926_80CE3187 X-CRM114-Status: GOOD ( 13.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The DT of_device.h and of_platform.h date back to the separate of_platform_bus_type before it was merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also include platform_device.h and of.h. As a result, there's a pretty much random mix of those include files used throughout the tree. In order to detangle these headers and replace the implicit includes with struct declarations, users need to explicitly include the correct includes. --- arch/arm/mach-omap2/board-generic.c | 3 +-- arch/arm/mach-omap2/omap4-common.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 10d2f078e4a8..fde6ccb3df6e 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -9,11 +9,10 @@ * to support the OMAP2+ device tree boards with an unique board file. */ #include -#include -#include #include #include #include +#include #include #include diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index d9ed2a5dcd5e..5d924b85b694 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c @@ -12,10 +12,9 @@ #include #include #include -#include #include +#include #include -#include #include #include #include