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: 703378 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E001C0015E for ; Fri, 14 Jul 2023 17:40:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236060AbjGNRkY (ORCPT ); Fri, 14 Jul 2023 13:40:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236063AbjGNRkX (ORCPT ); Fri, 14 Jul 2023 13:40:23 -0400 Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E89035A4; Fri, 14 Jul 2023 10:40:23 -0700 (PDT) Received: by mail-io1-f42.google.com with SMTP id ca18e2360f4ac-78372b895d6so89133939f.2; Fri, 14 Jul 2023 10:40:23 -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=CupngxT0p+NFdPJ5HH0jmIqofC4fTXb9nnC867pZvqLUlsy6GepmQLmzuWTVGRQWdo NycU8wmvOdqMOOu/u4mM1P7qdb5cx/n/Vc6j3yP2fbQY7t7LJ6FdIq4iacx57+a3a2mK CuUiqpwBV91YMgDT6xyHJKU6qyh6rmpUL/rFRK/swnHMv4JmUuMIYPNL7llSauLnBuhA Q+f5SEsiLe1vaslphyLJMu4yi1OuniTaQIRtDjGn0SK9pTocf4zWninrEPYeTdDIaqM7 rHGdu7HR4FaZGCqSOe95e+qMpN9GVhaDusmwywxlq7AL2XD2Kh5h9bYirG/vK7Z9bfZB rhHQ== X-Gm-Message-State: ABy/qLbQGHBt/EDCEwOszjnggYmx6KEvGUEH7/8PKUJssFrd9zcfcATj EQzS6Ztarr4usJQBHwKvXQ== 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 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.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