From patchwork Fri Jul 14 17:51:28 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: 13314042 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 2E537EB64DC for ; Fri, 14 Jul 2023 17:52:49 +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=dmY4IyCgdXn9yimxzwgGvKHjkTDouA6lLHQiscYDiWA=; b=gkpaOw0fcrzQqv Xy1G6WdmLogz4vogFOtIuoNEJ9AM3fdb0l+1Im+6+NuogtPLFPgn8N0ZPdtvkl5CPbMFEkLBTX++X 8Oe2rgN81FNOq9O5qRtLHTFRD3McXBC2x90R1jCpJq1lZAajeZtxSt/cNa5T77hQ3CFL5LMtjnMb9 FNjLG0InrytK/R0O34+XwsaZjG22gE0hK+hWT7/0TsXb6HT3jcfq+ZMk8zNjgtiBfOV5ucXcemVoz uzlLt6sZPTYb9tLHYNFKQTidgbaz+wWncYFEAB/vy9Nb5Bh3aug1SIFUnhVTEoXpMQ12/yFoTZK+Q R0hD8pmphKZav9VTWxjg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qKMxm-006sRi-37; Fri, 14 Jul 2023 17:52:18 +0000 Received: from mail-io1-f51.google.com ([209.85.166.51]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qKMxh-006sKZ-24 for linux-arm-kernel@lists.infradead.org; Fri, 14 Jul 2023 17:52:15 +0000 Received: by mail-io1-f51.google.com with SMTP id ca18e2360f4ac-78363cc070aso83862439f.1 for ; Fri, 14 Jul 2023 10:52:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689357133; x=1691949133; 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=UAZXEC0ZZSTboxvyemEYcLPqrWdEtetoC7pYf3hwIVs=; b=PfYJBMICmXaJjqUDNBkHVzGJuAbDmB/jWAE6qHEOxaCs2V6NYzJwPHRN7lQRKHEvhG 7keCbYkxK717oUu8aypv5GL8CiDzQB4e5rcW9LhCVDj7HjB9n4JJ4uVIFakQO3rImF01 o9Pvs13JUH9KOI8LRda589wzWBo/bGTQL1FkYfEA0KpjmsRzDVnfzBY48xs9ZT+SVkEi PiThgG4vj3ASKD2MTbQY3WeHuqO3JNLFjoa6Ku/9+8GuebYCDa54MTM0OlH1t1P9zZK7 O4b0C5s48osZryhBoU0vXX5cI0X6SfJ7MtV0526Kho0BAkj1t+53wHjedNhdMv3MfSmu G17Q== X-Gm-Message-State: ABy/qLYZh05N229gzVgeXCvtvFNkIJdA8irx7Xc/RtPwmx2zqzlmIKan aZZSbr5iDnzWZx/Cx3LaTA== X-Google-Smtp-Source: APBJJlE9JcsK12a+nn2E92glV3v0m6kTD9dSy4NFGvaTaUE4vjS3fqBwn27Us4irzM5tFOUlsZVZZQ== X-Received: by 2002:a05:6602:2565:b0:783:63d6:4cb with SMTP id dj5-20020a056602256500b0078363d604cbmr5307703iob.14.1689357132908; Fri, 14 Jul 2023 10:52:12 -0700 (PDT) Received: from robh_at_kernel.org ([64.188.179.250]) by smtp.gmail.com with ESMTPSA id ei2-20020a05663829a200b0042b4b1246cbsm2731387jab.148.2023.07.14.10.52.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 10:52:12 -0700 (PDT) Received: (nullmailer pid 4067193 invoked by uid 1000); Fri, 14 Jul 2023 17:51:29 -0000 From: Rob Herring To: Joel Stanley , Andrew Jeffery Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH] soc: aspeed: Explicitly include correct DT includes Date: Fri, 14 Jul 2023 11:51:28 -0600 Message-Id: <20230714175128.4067138-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-20230714_105213_699238_1BAC8FAF X-CRM114-Status: GOOD ( 12.86 ) 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. Signed-off-by: Rob Herring --- drivers/soc/aspeed/aspeed-lpc-snoop.c | 1 - drivers/soc/aspeed/aspeed-p2a-ctrl.c | 2 +- drivers/soc/aspeed/aspeed-uart-routing.c | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/soc/aspeed/aspeed-lpc-snoop.c b/drivers/soc/aspeed/aspeed-lpc-snoop.c index eceeaf8dfbeb..773dbcbc03a6 100644 --- a/drivers/soc/aspeed/aspeed-lpc-snoop.c +++ b/drivers/soc/aspeed/aspeed-lpc-snoop.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/soc/aspeed/aspeed-p2a-ctrl.c b/drivers/soc/aspeed/aspeed-p2a-ctrl.c index 20b5fb2a207c..548f44da28a9 100644 --- a/drivers/soc/aspeed/aspeed-p2a-ctrl.c +++ b/drivers/soc/aspeed/aspeed-p2a-ctrl.c @@ -18,8 +18,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/drivers/soc/aspeed/aspeed-uart-routing.c b/drivers/soc/aspeed/aspeed-uart-routing.c index ef8b24fd1851..8c89ad312c1d 100644 --- a/drivers/soc/aspeed/aspeed-uart-routing.c +++ b/drivers/soc/aspeed/aspeed-uart-routing.c @@ -5,8 +5,7 @@ */ #include #include -#include -#include +#include #include #include #include