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 X-Patchwork-Id: 121629 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1397270vqt; Mon, 17 Jul 2023 16:13:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlFXKfFIa+4WJY3Yexl/gDi4QSda2OAwW82IOM4UIvuzNt0jh0adhoRxQQEUvXy+M/YM9TZY X-Received: by 2002:a17:907:7891:b0:98e:35d1:9946 with SMTP id ku17-20020a170907789100b0098e35d19946mr558263ejc.64.1689635618482; Mon, 17 Jul 2023 16:13:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689635618; cv=none; d=google.com; s=arc-20160816; b=BAWbzbtL3zbe+yYLSW9DvY2duP2x4HlXDxps0kdgbPJG73vD8ajQTnVVsyqgZ/Bn5F A1mP/Fqb2mcnLp2uAPZ4fp+ruGaY+fETCoJSkxJMN6o0YlMF0Eko36HVt6OwwmwBIi0B LhKh3MIJu5Oc8Dpay0+FyjnnlqfcJp+EqaRVg8XgEfsd4KylvSBF2fApllbIDw8LF9jT zsQNuPGQ6DBW5lya9zb3DQdLIqWakMzqiIRVMBNDpzsEkLQaSWG1h7upxwglkGxaKP7Z sccZoEvymXajb3SJJFLY5iO7EGDBt9OZMa4+5pgBaXURzjSE2O20WkG8f5IhV1MIJAfC Pubg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=MIeTEUEjFKXNZqJjaX3OhaG7CUZyZiGr+aw/oQRplLw=; fh=QrML46yrfUPJxmpYosS2AnXncbbisQUzi6oXJ+nCzDI=; b=sDHkq2Tt3OSeNzoo8fyoXUKqIQHHTmGB5AG7xAv69LH/mpOK+w/pMyxdNdBeOrbSQC Uj1YXN8eajkmmNRdRI5SdOkPnXA2dlsJ6CM04TEG68STejCE47qVNJnukQ4N0XUoR2qE tm8X0PIVJzNA7iRKrw1poUdLjMkQ/1TBvM8Gt9U+WpV37Bt9/x2IbkA+aYK4zG0HzJk/ TDIm5EN5b+oOqLM7KoiLCRuZgxvJ17HmWyMjdTv4Xqsp1oPDLQJAWOcXhLcG338jgviG wbvzqvzzYJq4JLPmfqqJTxIEYCIfvkMMW4W43aBTH01xRUM1CCJrdD7tsO2kqP36f7nl Lz4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Evr8V0aH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v23-20020a1709067d9700b00992f1b3ce88si306771ejo.590.2023.07.17.16.13.14; Mon, 17 Jul 2023 16:13:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Evr8V0aH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230465AbjGQXAO (ORCPT + 99 others); Mon, 17 Jul 2023 19:00:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229862AbjGQXAM (ORCPT ); Mon, 17 Jul 2023 19:00:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A8C6198A for ; Mon, 17 Jul 2023 15:59:31 -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 E2AE4612B4 for ; 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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771711358451362601 X-GMAIL-MSGID: 1771711358451362601 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