From patchwork Thu Jul 20 17:27:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 13320919 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 74998EB64DD for ; Thu, 20 Jul 2023 17:28:16 +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=RvhvYCmtS/HOSmY2Rjka6x3Asb4aIw+L2pZfN4vdhMo=; b=rOMDq5kU+gLbGg t2f1F/FM5oViCwvNRVcnitJYmNXx3ARV2U95GM1VZIuNf49e329iz+8wAvILFYwQQ2OpUW/yR6ygd KgmzUaeLdIZRpZT+FWZkU2uRVNFnyT6hKSZ5jlh3CxQR/BUTD3Ng/CfPH9it8rKWmet4Vd/bBK8kQ +JO57BjM4CVA4KBBxNUn2y/KnBpoO5diEy3x6MPfEwNAk6akPJnPRQeuIXLdtutpny2R9/eJb9M3v 6nWBDh3znYnO4eJGNSo53u+j2P3gUCkv+R1/yyF72dVP3WwSyX025nfcZnmWyGbd5Wh+8Z0hQv0oF TucE7ERjs136egmkffiw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qMXRR-00Bmrz-2U; Thu, 20 Jul 2023 17:27:53 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qMXRP-00Bmrb-1t for linux-arm-kernel@lists.infradead.org; Thu, 20 Jul 2023 17:27:52 +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 D744261BB0; Thu, 20 Jul 2023 17:27:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3DAFEC433C8; Thu, 20 Jul 2023 17:27:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689874070; bh=1kh3ObTlvQNgnJvRmUsZj0kR/MmUDHQVLFfUagMOtjc=; h=From:To:Cc:Subject:Date:From; b=QD6XaiB2AWs/f/7Jh0I+EUpKz6saq19ntzsrNtrBCdFajZ1t4oId3GCfYQJZaLVtd XG98Ga+5xavB1sdYbbrAb5kAP94SsGvo8sFc2Bf5uG7GxuKI9nhv8/8yTUPUlcj0r9 Vji9FCrKKR6HoCabeZqqVL/au3URjV5iY6N1K5XUYO9M7bCftM7c4RC3Xb7dEPAKhx CcyM3Ye49OIPKCnonjrSS+xJkli2poy8/PoSwkzuxM7B184+K/HzfTqy7Qr1f7DCe/ 9mIrT0eVwxw0Zb7bn7GkqqCkag6uKEwPspbAgxq2/scyB66vCzaTiyuk95vL+hL/7A 88pea1gAPkVcA== Received: (nullmailer pid 2918734 invoked by uid 1000); Thu, 20 Jul 2023 17:27:49 -0000 From: Rob Herring To: Tony Lindgren , Russell King Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] ARM: omap2: Explicitly include correct DT includes Date: Thu, 20 Jul 2023 11:27:43 -0600 Message-Id: <20230720172743.2918601-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-20230720_102751_673498_C41450B0 X-CRM114-Status: GOOD ( 13.60 ) 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. Signed-off-by: Rob Herring --- v2: Add missing Sob --- 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