From patchwork Fri Jul 14 17:40:13 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: 13313883 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 292CDC0015E for ; Fri, 14 Jul 2023 17:40:51 +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=CcvuZt6AW1DRYTx+R5NoeXIDBWUTHlFCf0iMwKgTMtQ=; b=aFTHvMuXCAuBnh eBh77ZBXDB0A/wWmOm35I1BkVR/oziHJi2O9S/pqKxZ2/Bc7oeJhCUXienkRqXC7jY6ng4J+D36IU +9Q8udOgIJdB3mNogmaZ9pMIu5U+y2CDjMA1M2lru4aaCg/9Jm2cL0aMmkmdWoeLCO6cF2Uz4zWoB zjZCDRZT8SyJHvzBhD98NFs/7rsZRygTJYxanOTphLy0YGowNK+gKOhgVwzb9J0Fxcd6tvh7D4Ajz gJv4NSYW6jB43E6hcvZBJmNq0IEQHc5WpbJyiAMFmf0YP/eqUMPshvpBi2fai83wv3gxpcKJL+dlR awvBfIt/PuD7VGy+yS+Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qKMmJ-006m9T-1P; Fri, 14 Jul 2023 17:40:27 +0000 Received: from mail-io1-f43.google.com ([209.85.166.43]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qKMmG-006m8V-1J for linux-arm-kernel@lists.infradead.org; Fri, 14 Jul 2023 17:40:25 +0000 Received: by mail-io1-f43.google.com with SMTP id ca18e2360f4ac-78362f57500so88770239f.3 for ; Fri, 14 Jul 2023 10:40:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689356422; x=1691948422; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7kHAerUkbs1RohJjOwCTFu4xlcT9S1s0/Let059Z2xg=; b=hsFkLJeVhrGG74aowPrLRGMpE2QF+n547NInjyU3HyiPaw2Y+SCQNMUxchUonaWVsz gtCMKyiAZoaplV3PNhbNz+xpwD+D5X3D1dULflIhk4aruhbiKqoqign2fSbV9QkMfyC9 l2nhWZfctWMx7YHigaQ3kQYsKP3458/3moxuevKFC0PzlxhML5Z//oy8bIILq+LwuJZZ Q6r8BKGcUTj2Uqwgz2mNT0/l7qXGi1J/TmFWB6SbnS49pjVNgGO4xPDGLkMdWXjzpjO1 /IbQ0NGjOCrdJ7OY2FaKLnNr6r1RMuX2pqoolZT+Co9He8WZZjSkR9Gf2OKpglR90pe8 V7/g== X-Gm-Message-State: ABy/qLYsckVijVK9ChrRWTdMx1kxIRx6AqqZbNTlO1EKpit01zy+3/Al CvGUOWQMYBHFDkZIxazGOaC52/nKFw== X-Google-Smtp-Source: APBJJlFzSkB1qa3MKPkKdeVSqv6+ocZW+jua27gEw/v/06Z0vShwRdeeMZ9Q8qyEEEnAjtOwOcYg5A== X-Received: by 2002:a6b:d90e:0:b0:783:67a3:a69f with SMTP id r14-20020a6bd90e000000b0078367a3a69fmr6393180ioc.18.1689356422263; Fri, 14 Jul 2023 10:40:22 -0700 (PDT) Received: from robh_at_kernel.org ([64.188.179.250]) by smtp.gmail.com with ESMTPSA id y3-20020a6be503000000b00760f256037dsm2825959ioc.44.2023.07.14.10.40.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 10:40:21 -0700 (PDT) Received: (nullmailer pid 4039743 invoked by uid 1000); Fri, 14 Jul 2023 17:40:20 -0000 From: Rob Herring To: Russell King Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: Explicitly include correct DT includes Date: Fri, 14 Jul 2023 11:40:13 -0600 Message-Id: <20230714174014.4039560-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-20230714_104024_441888_A068B761 X-CRM114-Status: GOOD ( 13.35 ) 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 as 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 --- arch/arm/kernel/devtree.c | 1 - arch/arm/kernel/setup.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c index 264827281113..fdb74e64206a 100644 --- a/arch/arm/kernel/devtree.c +++ b/arch/arm/kernel/devtree.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index c66b560562b3..15eca804239e 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -15,10 +15,10 @@ #include #include #include -#include #include #include #include +#include #include #include #include