From patchwork Mon Jul 17 22:54:40 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: 13318382 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 EB77BEB64DA for ; Wed, 19 Jul 2023 06:51:26 +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=jNagrt9RJNLlJBbYJADI6cSVH/sZhXJJW0W5yNabo80=; b=HQgbKZxgfnVwVr CWiw4BteiIAHHZazdxwBH+QXL/D/lGaikFV4y5UO19UJ0UMikbv8qmk+a8GwsQkS2U3G5ZAeq3HVd hvjTAA+f0nXEGAazXjZyoEcTF8Dhk+AaYSMVskUuRBUvFRIbjQ2S1iq4OvSX0oTPXKGhBWuTSBNbk LCEUaJgs+/E7e/15Z+3F45S38/kSU+g7h5oo9b8Z0PmZt7VoFNGeAbqFAJ0gcY8b1QIHk+4kWZ3KL 8iLqPrccpFPQRDLtUpedYKJJ1baMOAPq4icQuNHp3pmV8iOFdgOQUtD9k29bSKGd2RLkfx1qC8tj3 TLPMjhpDN404fFHuWRlg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qM11i-005viw-2O; Wed, 19 Jul 2023 06:51:10 +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 1qM11b-005vfT-2t for linux-arm-kernel@bombadil.infradead.org; Wed, 19 Jul 2023 06:51:03 +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=MIeTEUEjFKXNZqJjaX3OhaG7CUZyZiGr+aw/oQRplLw=; b=AW4ANMr4tGg6RTOGtTvk6EQDDe 4ZB8wDm+5B91QphRBlX+tGBN0KD0fSy53bbdA1RmDYQpxpTm0oiXDztPrfEPOvkse65MOQiJ5W5Za gFBaxGuqXwD3GwWiecXhN4tpmhj7UmyScGJZF12k4xFx53wfb4CtFS9Pnr+cC8xPsjacSD5cWYA/4 8bpyB7/FbwRm5znpWwoq0Ry4/Bm0TM60suLjXxHMvGVWv8rpJc75kL9uvXl+1Eurb4v6u+SjpY0y+ n1r0udV793oAXdCkvJnkzI7raCqpwPJgKBSqXXA21DHzqkGd1YYV/C5TFHidjW1GXorTYo4j7A7xA KvUcIZLw==; 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 1qLXEs-009RDt-1i for linux-arm-kernel@lists.infradead.org; Mon, 17 Jul 2023 23:06:24 +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 E2AD7611E4; Mon, 17 Jul 2023 22:59:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D90C3C433C8; Mon, 17 Jul 2023 22:59:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689634765; bh=59X3yR/EgoAgz3Bwg/uGveK+/kUZJPeJEkI0bce8PH0=; h=From:To:Cc:Subject:Date:From; b=Evr8V0aHxUcMHX6RTsprPl0j9IxHvVbeJY7/iJGy/YVjzkYVrXcujcbvfsfFI/fys /QY+Icwoubh28+VOGYIvLHKnUYKivsyE8Igcf+Rm6iHs8PXkV1PGKAVCtLUt+0/NiC aRq8xDujB7mlkG9TY4HnrGBq17NtjNnJAQuz4ieFxhabi80vtI3KSAyRJSOtLKzO0X vCGvsQJyzNpAb0G0PpyUm+nXw4AlDIphysbV57nwc+VA8xiEeH63CjRLoaOTruHtPt MPg3FOAG7ef1oJ7cvq7X17pqFofhcMEf3xexF9iIvVVh0jNHAJhuSYV3sF1wjmGcx8 /lcfUwtPvQoJQ== Received: (nullmailer pid 3211693 invoked by uid 1000); Mon, 17 Jul 2023 22:54:44 -0000 From: Rob Herring To: Dinh Nguyen , Russell King Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: socfpga: Explicitly include correct DT includes Date: Mon, 17 Jul 2023 16:54:40 -0600 Message-Id: <20230717225440.3211576-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 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. A couple of other includes are unused and can be dropped too. Signed-off-by: Rob Herring --- arch/arm/mach-socfpga/l2_cache.c | 2 +- arch/arm/mach-socfpga/ocram.c | 4 +--- arch/arm/mach-socfpga/pm.c | 2 ++ arch/arm/mach-socfpga/socfpga.c | 4 +--- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-socfpga/l2_cache.c b/arch/arm/mach-socfpga/l2_cache.c index 99fb95361590..86e011eeb444 100644 --- a/arch/arm/mach-socfpga/l2_cache.c +++ b/arch/arm/mach-socfpga/l2_cache.c @@ -3,7 +3,7 @@ * Copyright Altera Corporation (C) 2016. All rights reserved. */ #include -#include +#include #include #include "core.h" diff --git a/arch/arm/mach-socfpga/ocram.c b/arch/arm/mach-socfpga/ocram.c index b4d397e834a0..9f1a249debf6 100644 --- a/arch/arm/mach-socfpga/ocram.c +++ b/arch/arm/mach-socfpga/ocram.c @@ -4,10 +4,8 @@ */ #include #include -#include -#include +#include #include -#include #include "core.h" diff --git a/arch/arm/mach-socfpga/pm.c b/arch/arm/mach-socfpga/pm.c index 365c0428b21b..ab1c08f971f0 100644 --- a/arch/arm/mach-socfpga/pm.c +++ b/arch/arm/mach-socfpga/pm.c @@ -13,7 +13,9 @@ #include #include #include +#include #include +#include #include #include #include diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c index 9e4cb2ffd580..4332af2d8b86 100644 --- a/arch/arm/mach-socfpga/socfpga.c +++ b/arch/arm/mach-socfpga/socfpga.c @@ -3,13 +3,11 @@ * Copyright (C) 2012-2015 Altera Corporation */ #include +#include #include -#include -#include #include #include -#include #include #include #include