From patchwork Tue Jul 18 14:31:01 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: 705438 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 C9535EB64DC for ; Tue, 18 Jul 2023 14:31:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232513AbjGRObj (ORCPT ); Tue, 18 Jul 2023 10:31:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232692AbjGRObg (ORCPT ); Tue, 18 Jul 2023 10:31:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC0101BD9; Tue, 18 Jul 2023 07:31:11 -0700 (PDT) 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 26F0C615E2; Tue, 18 Jul 2023 14:31:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3DB62C433C7; Tue, 18 Jul 2023 14:31:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689690670; bh=KFSOdgGe2AR4rCLx81EdF6WoCI+RZt43fQf1DLPQLYg=; h=From:To:Cc:Subject:Date:From; b=clYMJlj7g8He9tuMGZ8gXMzyV1Xn9XporLTeQxR7cM5i+sjbFBFNpglXf7kgfEOYj fSt3DoxGYG1koXlwohYqsHcAAEPei3NecuG5uRQjzPEphai8TtgsVLv9cBnIDmoWMP yH6B6+xTsmtOX+G17kMUHMEEIQ+fJhlV+41s+ENFHxdXPJmVHobxVfD/MtR+q/5L0V MEijRNwKYh8YzFf00Jzw/khWAXIJmZwERzJMtxfYCOIHQes99tWXExjbdX5/xoUCdJ OuSAGcf4hySbCSH/XjKvNP3On0YXcuIx7F6ewRiUzWAWfY0XkK12xGzm76W2zVgQU0 Yk51ZrYmZiqxQ== Received: (nullmailer pid 1065624 invoked by uid 1000); Tue, 18 Jul 2023 14:31:08 -0000 From: Rob Herring To: Frederic Barrat , Andrew Donnellan , Arnd Bergmann , Greg Kroah-Hartman , Srinivas Kandagatla , Amol Maheshwari , Eric Piel , Andy Gross , Bjorn Andersson , Konrad Dybcio , Derek Kiernan , Dragan Cvetic , Michal Simek , Appana Durga Kedareswara rao Cc: devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] misc: Explicitly include correct DT includes Date: Tue, 18 Jul 2023 08:31:01 -0600 Message-Id: <20230718143102.1065481-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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. Acked-by: Andrew Donnellan # cxl Signed-off-by: Rob Herring --- v2: - Fix double include of of.h --- drivers/misc/cxl/base.c | 1 + drivers/misc/fastrpc.c | 1 + drivers/misc/lis3lv02d/lis3lv02d.c | 2 +- drivers/misc/qcom-coincell.c | 1 - drivers/misc/sram.c | 2 +- drivers/misc/vcpu_stall_detector.c | 1 - drivers/misc/xilinx_sdfec.c | 3 ++- drivers/misc/xilinx_tmr_inject.c | 3 ++- drivers/misc/xilinx_tmr_manager.c | 3 ++- 9 files changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/misc/cxl/base.c b/drivers/misc/cxl/base.c index cc0caf9192dc..b054562c046e 100644 --- a/drivers/misc/cxl/base.c +++ b/drivers/misc/cxl/base.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include "cxl.h" diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index 9666d28037e1..1c7c0532da6f 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c index 299d316f1bda..49868a45c0ad 100644 --- a/drivers/misc/lis3lv02d/lis3lv02d.c +++ b/drivers/misc/lis3lv02d/lis3lv02d.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "lis3lv02d.h" #define DRIVER_NAME "lis3lv02d" diff --git a/drivers/misc/qcom-coincell.c b/drivers/misc/qcom-coincell.c index 54d4f6ee8888..3c57f7429147 100644 --- a/drivers/misc/qcom-coincell.c +++ b/drivers/misc/qcom-coincell.c @@ -8,7 +8,6 @@ #include #include #include -#include #include struct qcom_coincell { diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c index 5757adf418b1..a88f92cf35be 100644 --- a/drivers/misc/sram.c +++ b/drivers/misc/sram.c @@ -10,8 +10,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/drivers/misc/vcpu_stall_detector.c b/drivers/misc/vcpu_stall_detector.c index 53b5506080e1..6479c962da1a 100644 --- a/drivers/misc/vcpu_stall_detector.c +++ b/drivers/misc/vcpu_stall_detector.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/misc/xilinx_sdfec.c b/drivers/misc/xilinx_sdfec.c index 270ff4c5971a..29e9c380b643 100644 --- a/drivers/misc/xilinx_sdfec.c +++ b/drivers/misc/xilinx_sdfec.c @@ -15,7 +15,8 @@ #include #include #include -#include +#include +#include #include #include #include diff --git a/drivers/misc/xilinx_tmr_inject.c b/drivers/misc/xilinx_tmr_inject.c index d96f6d7cd109..9fc5835bfebc 100644 --- a/drivers/misc/xilinx_tmr_inject.c +++ b/drivers/misc/xilinx_tmr_inject.c @@ -11,7 +11,8 @@ #include #include -#include +#include +#include #include /* TMR Inject Register offsets */ diff --git a/drivers/misc/xilinx_tmr_manager.c b/drivers/misc/xilinx_tmr_manager.c index 0ef55e06d3a0..3e4e40c3766f 100644 --- a/drivers/misc/xilinx_tmr_manager.c +++ b/drivers/misc/xilinx_tmr_manager.c @@ -15,7 +15,8 @@ #include #include -#include +#include +#include /* TMR Manager Register offsets */ #define XTMR_MANAGER_CR_OFFSET 0x0