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: 13318567 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 911C7C001DC for ; Wed, 19 Jul 2023 08:23:15 +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=xXgn2L2/bXjJYjDQNWxi7DvfFODSY0krTHv6H92hmZk=; b=ZaSDEJVijV7j0B TOftRYHJK0/VfNRjw7aUv7ndzz2NBdHaIuxn0ZI4YsBzJ+rSQTiGmLHC3T9BPJbMOLOZFveKJ2GME TgX3B1j4Do/amY07Uw7+mpy8LOtnXfUzcd9wx46fQBj9AKu09iPgmSVl7oiOZUJNmyIZx5tcVF12k N9BzOP91uAd5Hix7mYMyzmto5DC5OEim3YNGPGlLwE6CSFm5Cs6WM9H1iB7U4MVL6p7SGAse4hBIq W6YW+ptMba18V8I9KsWLhP4HRoWN66C/riFTIL7pwXFC+BmXkj7loyakLPHotaQ+FnE84LbHKLNu9 YTZt11N8q9KYF7JoAuCQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qM2Sb-006JlQ-24; Wed, 19 Jul 2023 08:23:01 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qM2SV-006Jj0-0a for linux-arm-kernel@bombadil.infradead.org; Wed, 19 Jul 2023 08:22:55 +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=+79QXFDLY/zor1UTJkXojFfvwWx5k20Oe9dnXkc+dYc=; b=VAg+vS+1nVWzj6nIA9aD8TiHP0 FSf7VwDAJLoLrqGvPV6NTFYOOkD7Yp8RpLFlVrvYCO5vjtU7u5VYoCs48M7wrAOD2yiBN3sHBEl7h HPvIZU2pRrXlM81N10tpBi2J2ailSguMcKMhnUC1s0fPCvORZgvXxRxTIFxzltzpWiAvYux40MT1S /fLODHx+D3/qdlvemgt+KEUCMkqJXbo+7SdC2SMhloOlKN9i2dEoWumwhgGyqfN2JqNUWDgNgUS13 k7JMgFTG8wI10R61Q0pKJeCGhbgerrm/DOyJxtRczdR9bASc1Mbi6aOJztVxUvrxO1/Uh7WnIVTg+ 4Uvg0Dxg==; 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 1qLljg-00Bdar-2I for linux-arm-kernel@lists.infradead.org; Tue, 18 Jul 2023 14:31:35 +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 26280615E0; 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230718_153133_729316_BCA40115 X-CRM114-Status: GOOD ( 13.66 ) 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. 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