From patchwork Fri Jul 14 17:51:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 13314087 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 A299AC001DC for ; Fri, 14 Jul 2023 17:53:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236721AbjGNRxw (ORCPT ); Fri, 14 Jul 2023 13:53:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236730AbjGNRxl (ORCPT ); Fri, 14 Jul 2023 13:53:41 -0400 Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A6B03C18; Fri, 14 Jul 2023 10:53:04 -0700 (PDT) Received: by mail-io1-f42.google.com with SMTP id ca18e2360f4ac-78362f574c9so85313739f.3; Fri, 14 Jul 2023 10:53:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689357114; x=1691949114; 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=oUCqimK49P5lCTFGeVnbSOLxdP8E41cIVWFQaRpK1M0=; b=WvHZxPB6Toq8YBWo2lYxH5nOQNBRQ9OM70rQDXgf7hOTwQBNDjhKyFli+e5ccljpjv wn42tEkErTUf6keuVkL4HAfQGBgiZzClwN4FczLpDZsr/gIHfsH9BdrbFQ7yW5Fylt5f ykjzLVTpAA/9AUtbGDXdcqGjCy9Bkqu4SOu9BUNnOsB3izBnjbjkUC89v0KzbVVT4KM0 bMyiv3jZZYAGohEjRZiAGLHjjM3In9dlSYytDgXYNzG/1rn3Se/zUC6fLANeOMoQ7t5z 4Z2DBIo+afmEDsXwMJ+yRMakW1DCJl2QQzTGs1xfPlZ9PXVWsjgoLHlwR0UpesWzbctz B+EQ== X-Gm-Message-State: ABy/qLY6gVCDiC1NrE8oGTL5GqWzewWshglPPeV3pSBMEmERTuSaM4wd R/QkfuQWLPIe1LgePrWkdQ== X-Google-Smtp-Source: APBJJlFzoEK9PmbtG2MQODYrV/Oe3Doi0vguK88EKVP/4XKRmVMrTImpsbwYn/ziQ4UgVO7VYuWb2A== X-Received: by 2002:a92:c842:0:b0:346:2b9f:1fb with SMTP id b2-20020a92c842000000b003462b9f01fbmr5504145ilq.22.1689357114500; Fri, 14 Jul 2023 10:51:54 -0700 (PDT) Received: from robh_at_kernel.org ([64.188.179.250]) by smtp.gmail.com with ESMTPSA id m19-20020a056638225300b0042b6ae47f0esm2756207jas.108.2023.07.14.10.51.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 10:51:53 -0700 (PDT) Received: (nullmailer pid 4067875 invoked by uid 1000); Fri, 14 Jul 2023 17:51:43 -0000 From: Rob Herring To: Bjorn Andersson , Konrad Dybcio , Andy Gross , Krzysztof Kozlowski Cc: devicetree@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] soc: qcom: Explicitly include correct DT includes Date: Fri, 14 Jul 2023 11:51:41 -0600 Message-Id: <20230714175142.4067795-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. Signed-off-by: Rob Herring --- drivers/soc/qcom/cpr.c | 1 - drivers/soc/qcom/icc-bwmon.c | 2 +- drivers/soc/qcom/ice.c | 2 ++ drivers/soc/qcom/llcc-qcom.c | 1 - drivers/soc/qcom/ocmem.c | 3 ++- drivers/soc/qcom/pmic_glink.c | 2 +- drivers/soc/qcom/pmic_glink_altmode.c | 1 + drivers/soc/qcom/rpmhpd.c | 1 - drivers/soc/qcom/rpmpd.c | 1 - drivers/soc/qcom/spm.c | 2 -- drivers/soc/qcom/wcnss_ctrl.c | 1 + 11 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/soc/qcom/cpr.c b/drivers/soc/qcom/cpr.c index 144ea68e0920..94a3f0977212 100644 --- a/drivers/soc/qcom/cpr.c +++ b/drivers/soc/qcom/cpr.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/soc/qcom/icc-bwmon.c b/drivers/soc/qcom/icc-bwmon.c index 40068a285913..1fd77cdb40d6 100644 --- a/drivers/soc/qcom/icc-bwmon.c +++ b/drivers/soc/qcom/icc-bwmon.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/soc/qcom/ice.c b/drivers/soc/qcom/ice.c index a6123ea96272..fbab7fe5c652 100644 --- a/drivers/soc/qcom/ice.c +++ b/drivers/soc/qcom/ice.c @@ -11,7 +11,9 @@ #include #include #include +#include #include +#include #include diff --git a/drivers/soc/qcom/llcc-qcom.c b/drivers/soc/qcom/llcc-qcom.c index 67c19ed2219a..e32a4161a8d0 100644 --- a/drivers/soc/qcom/llcc-qcom.c +++ b/drivers/soc/qcom/llcc-qcom.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/soc/qcom/ocmem.c b/drivers/soc/qcom/ocmem.c index aaddc3cc53b7..5031ce9476ab 100644 --- a/drivers/soc/qcom/ocmem.c +++ b/drivers/soc/qcom/ocmem.c @@ -14,7 +14,8 @@ #include #include #include -#include +#include +#include #include #include #include diff --git a/drivers/soc/qcom/pmic_glink.c b/drivers/soc/qcom/pmic_glink.c index c87056769ebd..264e63493bfe 100644 --- a/drivers/soc/qcom/pmic_glink.c +++ b/drivers/soc/qcom/pmic_glink.c @@ -4,8 +4,8 @@ * Copyright (c) 2022, Linaro Ltd */ #include -#include #include +#include #include #include #include diff --git a/drivers/soc/qcom/pmic_glink_altmode.c b/drivers/soc/qcom/pmic_glink_altmode.c index df48fbea4b68..1dedacc52aea 100644 --- a/drivers/soc/qcom/pmic_glink_altmode.c +++ b/drivers/soc/qcom/pmic_glink_altmode.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/soc/qcom/rpmhpd.c b/drivers/soc/qcom/rpmhpd.c index 63c35a32065b..2cae1d0aef48 100644 --- a/drivers/soc/qcom/rpmhpd.c +++ b/drivers/soc/qcom/rpmhpd.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/soc/qcom/rpmpd.c index 99b017fd76b7..bccaff942130 100644 --- a/drivers/soc/qcom/rpmpd.c +++ b/drivers/soc/qcom/rpmpd.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/soc/qcom/spm.c b/drivers/soc/qcom/spm.c index a6cbeb40831b..77b90da04894 100644 --- a/drivers/soc/qcom/spm.c +++ b/drivers/soc/qcom/spm.c @@ -12,8 +12,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/drivers/soc/qcom/wcnss_ctrl.c b/drivers/soc/qcom/wcnss_ctrl.c index 2a06d631e415..ad9942412c58 100644 --- a/drivers/soc/qcom/wcnss_ctrl.c +++ b/drivers/soc/qcom/wcnss_ctrl.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include