From patchwork Fri Jul 14 17:48:19 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: 702896 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 6E435C001DC for ; Fri, 14 Jul 2023 18:03:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236343AbjGNSDV (ORCPT ); Fri, 14 Jul 2023 14:03:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236893AbjGNSDA (ORCPT ); Fri, 14 Jul 2023 14:03:00 -0400 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E45141BD4; Fri, 14 Jul 2023 11:02:19 -0700 (PDT) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6689430d803so1552576b3a.0; Fri, 14 Jul 2023 11:02:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689357638; x=1691949638; 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=VEDFXJd+HyeNGJNHuEH7D6MtkxF59/d6sJQFVKlHh5c=; b=kWzIWeArXprF5kImSWjCPi/1L41KmqSA2XkqTOd6baXnGpQTzkO2egPgc4nEOKetWA gTBeaxn+pxRYyeyFBMMDZuQy+Z1wbjRqF4UZvuhv/OjaVESpnvm74ANAvLPQE3ydg/1Y 3NrIIo5OvepjXdOzJT0gGV5htra5o5xdWAumBjFV2ongtoXRxikW0/h82n7y5fiUf7s+ tuMdCA4iix4et4gijAdgMeqfDBUknwYYL1UkZ8O4gq10kdd39XqKAW6i1h+NG3LfaiN1 YQudS6q1yx7jNqDqEe3pWjL4nZEi9FV2t9oFUWFb4a9vcwsobPrDX9iIhCC8vEHfrZXh 7OPw== X-Gm-Message-State: ABy/qLYZ08/xzFpvgA8rGDUYH6RIHSz0wD+4SkP0GCcu2+6MtvvpoHag Yp8R7w2pooIyUzJV/OOvjjRpw7EWyCWN X-Google-Smtp-Source: APBJJlEjthmoOidP8epR7rmEF7FbVHzu9+xj4wtIduz2jJrPeEmqxx2cmbszrPFZy8H5AUkScJ9vBg== X-Received: by 2002:a92:4b0f:0:b0:345:b40e:43b3 with SMTP id m15-20020a924b0f000000b00345b40e43b3mr4980194ilg.12.1689356933744; Fri, 14 Jul 2023 10:48:53 -0700 (PDT) Received: from robh_at_kernel.org ([64.188.179.250]) by smtp.gmail.com with ESMTPSA id a16-20020a02ac10000000b0042916ad15bcsm2641166jao.31.2023.07.14.10.48.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 10:48:53 -0700 (PDT) Received: (nullmailer pid 4061529 invoked by uid 1000); Fri, 14 Jul 2023 17:48:25 -0000 From: Rob Herring To: Srinivas Kandagatla , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Vladimir Zapolskiy , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Andy Gross , Bjorn Andersson , Konrad Dybcio , Orson Zhai , Baolin Wang , Chunyan Zhang , Vincent Shih , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH] nvmem: Explicitly include correct DT includes Date: Fri, 14 Jul 2023 11:48:19 -0600 Message-Id: <20230714174820.4061387-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@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/nvmem/bcm-ocotp.c | 1 - drivers/nvmem/core.c | 1 - drivers/nvmem/imx-iim.c | 1 - drivers/nvmem/imx-ocotp-ele.c | 2 +- drivers/nvmem/imx-ocotp-scu.c | 2 +- drivers/nvmem/imx-ocotp.c | 1 - drivers/nvmem/lpc18xx_otp.c | 1 - drivers/nvmem/meson-mx-efuse.c | 1 - drivers/nvmem/qcom-spmi-sdam.c | 2 +- drivers/nvmem/rave-sp-eeprom.c | 2 +- drivers/nvmem/sc27xx-efuse.c | 1 - drivers/nvmem/snvs_lpgpr.c | 3 ++- drivers/nvmem/sprd-efuse.c | 2 +- drivers/nvmem/sunplus-ocotp.c | 2 +- drivers/nvmem/sunxi_sid.c | 1 - drivers/nvmem/u-boot-env.c | 2 +- 16 files changed, 9 insertions(+), 16 deletions(-) diff --git a/drivers/nvmem/bcm-ocotp.c b/drivers/nvmem/bcm-ocotp.c index 0c1fa0c4feb2..2490f44caa40 100644 --- a/drivers/nvmem/bcm-ocotp.c +++ b/drivers/nvmem/bcm-ocotp.c @@ -8,7 +8,6 @@ #include #include #include -#include #include /* diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 3f8c7718412b..2251103b2c5f 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -17,7 +17,6 @@ #include #include #include -#include #include struct nvmem_device { diff --git a/drivers/nvmem/imx-iim.c b/drivers/nvmem/imx-iim.c index c86339a7f583..f13bbd164086 100644 --- a/drivers/nvmem/imx-iim.c +++ b/drivers/nvmem/imx-iim.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/nvmem/imx-ocotp-ele.c b/drivers/nvmem/imx-ocotp-ele.c index f1cbbc9afeb8..cf920542f939 100644 --- a/drivers/nvmem/imx-ocotp-ele.c +++ b/drivers/nvmem/imx-ocotp-ele.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/nvmem/imx-ocotp-scu.c b/drivers/nvmem/imx-ocotp-scu.c index 399e1eb8b4c1..c38d9c1c3f48 100644 --- a/drivers/nvmem/imx-ocotp-scu.c +++ b/drivers/nvmem/imx-ocotp-scu.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c index ab556c011f3e..a223d9537f22 100644 --- a/drivers/nvmem/imx-ocotp.c +++ b/drivers/nvmem/imx-ocotp.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/nvmem/lpc18xx_otp.c b/drivers/nvmem/lpc18xx_otp.c index 16c92ea85d49..6898c852ce43 100644 --- a/drivers/nvmem/lpc18xx_otp.c +++ b/drivers/nvmem/lpc18xx_otp.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include diff --git a/drivers/nvmem/meson-mx-efuse.c b/drivers/nvmem/meson-mx-efuse.c index 13eb14316f46..2007f7b1bd22 100644 --- a/drivers/nvmem/meson-mx-efuse.c +++ b/drivers/nvmem/meson-mx-efuse.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/nvmem/qcom-spmi-sdam.c b/drivers/nvmem/qcom-spmi-sdam.c index f822790db49e..70f2d4f2efbf 100644 --- a/drivers/nvmem/qcom-spmi-sdam.c +++ b/drivers/nvmem/qcom-spmi-sdam.c @@ -6,8 +6,8 @@ #include #include #include -#include #include +#include #include #define SDAM_MEM_START 0x40 diff --git a/drivers/nvmem/rave-sp-eeprom.c b/drivers/nvmem/rave-sp-eeprom.c index c456011b75e8..df6a1c594b78 100644 --- a/drivers/nvmem/rave-sp-eeprom.c +++ b/drivers/nvmem/rave-sp-eeprom.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/nvmem/sc27xx-efuse.c b/drivers/nvmem/sc27xx-efuse.c index c825fc902d10..2210da40dfbd 100644 --- a/drivers/nvmem/sc27xx-efuse.c +++ b/drivers/nvmem/sc27xx-efuse.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/nvmem/snvs_lpgpr.c b/drivers/nvmem/snvs_lpgpr.c index 4692aa985bd6..89c27112320f 100644 --- a/drivers/nvmem/snvs_lpgpr.c +++ b/drivers/nvmem/snvs_lpgpr.c @@ -7,7 +7,8 @@ #include #include #include -#include +#include +#include #include #define IMX6Q_SNVS_HPLR 0x00 diff --git a/drivers/nvmem/sprd-efuse.c b/drivers/nvmem/sprd-efuse.c index 4f1fcbfec394..7e6e31db4baa 100644 --- a/drivers/nvmem/sprd-efuse.c +++ b/drivers/nvmem/sprd-efuse.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #define SPRD_EFUSE_ENABLE 0x20 diff --git a/drivers/nvmem/sunplus-ocotp.c b/drivers/nvmem/sunplus-ocotp.c index f85350b17d67..f3a18aa0a6c7 100644 --- a/drivers/nvmem/sunplus-ocotp.c +++ b/drivers/nvmem/sunplus-ocotp.c @@ -13,8 +13,8 @@ #include #include #include +#include #include -#include #include /* diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c index a970f1741cc6..829e24eb59f2 100644 --- a/drivers/nvmem/sunxi_sid.c +++ b/drivers/nvmem/sunxi_sid.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/nvmem/u-boot-env.c b/drivers/nvmem/u-boot-env.c index ee9fd9989b6e..80c5382b361c 100644 --- a/drivers/nvmem/u-boot-env.c +++ b/drivers/nvmem/u-boot-env.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include