From patchwork Fri Jul 14 17:50:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 120650 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2672774vqm; Fri, 14 Jul 2023 11:12:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlExKLsdnE4+QyYLUuLrdc4POoIzN6DMhJVH1bG8P1s5SkpuRwFtKgzWA7V7sxLJ9ZeRXCKQ X-Received: by 2002:a05:6a20:12d1:b0:133:862e:2105 with SMTP id v17-20020a056a2012d100b00133862e2105mr4529039pzg.38.1689358346353; Fri, 14 Jul 2023 11:12:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689358346; cv=none; d=google.com; s=arc-20160816; b=nrT5HMb8h4ayOxdyHWEhUL5tSL5REhLaruwOJkuL3cQHvjdwT5tzyUvd4EGuaSKlZd 1q0JcJuaZKml6p/AFSpC8mP8Ld35zGBxqzXB2i9RwvRR5/N5gsWWATFzhfcpWAUDg0zV 6XcCMxABgMLYpPaTxRW0JSn2yzBN5r+7SOPpj758C+AB6m3/kZaMjlU4mCp5zTNhQBo+ LWIN4Ed9vfp9eZbG9U1c8w+hFZg+EC71A11kZRP7Cm/kbP5ZMwM8kTHC/FtHdtYgD00h CPoVTFH9ZUlWhhZdSqKphemUkh63TGtr7YiNz+/lPtUR3wVC8O25XO8GjOR7gvi+MzNH sxwA== 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; bh=dfZt0Y26M5pBCstI8AhRHneftpCtl5efvu3OXJ2yZ/o=; fh=GvMAM8ehYvJ0tg7WGfwfd2HwAgjhzm6uqMzvR8AbFog=; b=GKVTG6t5fZQPr5cGmcKyAFNLdY790EIgbMJ248ps62OsyHvyz6CalYfHbeb/oFqtO3 OtyWzQleTuRFPdIz7BLWj8XCQnbRQiVm+ifP7GT2sbmyC1pfP+OL09m9Yethhr84ck3z hAdZS7vHCXWZFGWnb8smuqP/mQGTMriGzf/pWcR/bk4APXD4WWWiYj0FQOqouDD1vIlO kenW8e8PGAkUA3j/nUihrv++xFILAoqQHgz/hCy7Dnf2e9BuT+adogb/qDl9DuS40GqG cBgW15ZoofMfWcFexLoGKSNJDyF02bHSH2VjXKo52AK9Zy7iT54ufeRs4LhHzg3knzyN //Ww== ARC-Authentication-Results: i=1; mx.google.com; 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 w186-20020a6382c3000000b0054fd06a3585si3113768pgd.158.2023.07.14.11.12.13; Fri, 14 Jul 2023 11:12:26 -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; 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 S236748AbjGNRxx (ORCPT + 99 others); Fri, 14 Jul 2023 13:53:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236729AbjGNRxg (ORCPT ); Fri, 14 Jul 2023 13:53:36 -0400 Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90B413ABF; Fri, 14 Jul 2023 10:53:02 -0700 (PDT) Received: by mail-il1-x12b.google.com with SMTP id e9e14a558f8ab-3465ec72cc8so10226615ab.0; Fri, 14 Jul 2023 10:53:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689357062; x=1691949062; 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=dfZt0Y26M5pBCstI8AhRHneftpCtl5efvu3OXJ2yZ/o=; b=XGuczVMbtdXlJ7TpBtfPFxyTRR1ZMb/1dU4qxhC7Jg04AGktHGhEHIj9MyLEuNgBrm VHt0aMs2lmlRO8cQKcNFxuhmFHG5pQzTwMWjcZ1UjsNGk0VOErM/mA/YS2w5lg2wtKZK NYlpHUNGsfBrmafAXB0uv0122recnvjjuBOUoTwvAAkXWckjiEq54YsETfGdmvW2VLlt dW2xaAIcCzeOhH0SVz/TeAkPsd0WTm5DzHAqyYrSGvfORK/dJ+fRJGYo9Dv2LJWn581H tdmLz4HidqOMXGZIxTMHuCQq55mquiAww+Es60Gqcpy/HV3GMgMMouGcyUOViydO7yS3 ohHw== X-Gm-Message-State: ABy/qLb1d4+pz1a0ZPJjFG+jnjQtY3NPMvJWyktDz0cRndPp0LeH3bp5 j3oATOe/cOugpYBGExmZ2A== X-Received: by 2002:a92:d181:0:b0:341:e2aa:3552 with SMTP id z1-20020a92d181000000b00341e2aa3552mr4865990ilz.4.1689357062084; Fri, 14 Jul 2023 10:51:02 -0700 (PDT) Received: from robh_at_kernel.org ([64.188.179.250]) by smtp.gmail.com with ESMTPSA id ee13-20020a056638292d00b0042b1354452csm2789728jab.83.2023.07.14.10.50.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 10:51:01 -0700 (PDT) Received: (nullmailer pid 4064549 invoked by uid 1000); Fri, 14 Jul 2023 17:50:06 -0000 From: Rob Herring To: Greg Kroah-Hartman , Vaibhav Hiremath , Johan Hovold , Alex Elder , Steve Longerbeam , Philipp Zabel , Mauro Carvalho Chehab , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Maxime Ripard , Paul Kocialkowski , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Thierry Reding , Jonathan Hunter , Sowjanya Komatineni , Luca Ceresoli , Parthiban Veerasooran , Christian Gromm Cc: devicetree@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, greybus-dev@lists.linaro.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org Subject: [PATCH] staging: Explicitly include correct DT includes Date: Fri, 14 Jul 2023 11:50:01 -0600 Message-Id: <20230714175002.4064428-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no 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: 1771420617525498603 X-GMAIL-MSGID: 1771420617525498603 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 Acked-by: Alex Elder Reviewed-by: Luca Ceresoli # tegra-video Acked-by: Parthiban Veerasooran Reviewed-by: Hans Verkuil --- drivers/staging/axis-fifo/axis-fifo.c | 6 ++---- drivers/staging/greybus/arche-platform.c | 1 + drivers/staging/media/imx/imx-media-capture.c | 1 - drivers/staging/media/imx/imx-media-dev-common.c | 2 -- drivers/staging/media/imx/imx8mq-mipi-csi2.c | 1 - drivers/staging/media/meson/vdec/esparser.c | 1 - drivers/staging/media/meson/vdec/vdec.c | 2 +- drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 2 +- drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c | 1 - drivers/staging/media/tegra-video/csi.c | 1 - drivers/staging/media/tegra-video/vi.c | 2 +- drivers/staging/media/tegra-video/vip.c | 1 - drivers/staging/most/dim2/dim2.c | 2 +- drivers/staging/pi433/pi433_if.c | 1 - 14 files changed, 7 insertions(+), 17 deletions(-) diff --git a/drivers/staging/axis-fifo/axis-fifo.c b/drivers/staging/axis-fifo/axis-fifo.c index 98db47cb4fa4..5910fada7075 100644 --- a/drivers/staging/axis-fifo/axis-fifo.c +++ b/drivers/staging/axis-fifo/axis-fifo.c @@ -15,6 +15,8 @@ */ #include +#include +#include #include #include #include @@ -32,10 +34,6 @@ #include #include -#include -#include -#include - /* ---------------------------- * driver parameters * ---------------------------- diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c index ebe835f25d13..891b75327d7f 100644 --- a/drivers/staging/greybus/arche-platform.c +++ b/drivers/staging/greybus/arche-platform.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "arche_platform.h" #if IS_ENABLED(CONFIG_USB_HSIC_USB3613) diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c index 4364df27c6d2..4846078315ff 100644 --- a/drivers/staging/media/imx/imx-media-capture.c +++ b/drivers/staging/media/imx/imx-media-capture.c @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/staging/media/imx/imx-media-dev-common.c b/drivers/staging/media/imx/imx-media-dev-common.c index 991820a8500f..7b7cbec08326 100644 --- a/drivers/staging/media/imx/imx-media-dev-common.c +++ b/drivers/staging/media/imx/imx-media-dev-common.c @@ -6,8 +6,6 @@ * Copyright (c) 2016 Mentor Graphics Inc. */ -#include -#include #include #include #include diff --git a/drivers/staging/media/imx/imx8mq-mipi-csi2.c b/drivers/staging/media/imx/imx8mq-mipi-csi2.c index ca2efcc21efe..c84b6dceece2 100644 --- a/drivers/staging/media/imx/imx8mq-mipi-csi2.c +++ b/drivers/staging/media/imx/imx8mq-mipi-csi2.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c index 7b15fc54efe4..4632346f04a9 100644 --- a/drivers/staging/media/meson/vdec/esparser.c +++ b/drivers/staging/media/meson/vdec/esparser.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c index 5ca4b1200831..219185aaa588 100644 --- a/drivers/staging/media/meson/vdec/vdec.c +++ b/drivers/staging/media/meson/vdec/vdec.c @@ -4,7 +4,7 @@ * Author: Maxime Jourdan */ -#include +#include #include #include #include diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c index fa86a658fdc6..b696bf884cbd 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c @@ -14,8 +14,8 @@ */ #include +#include #include -#include #include #include #include diff --git a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c index 0dc75adbd9d8..8337dc487047 100644 --- a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c +++ b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/media/tegra-video/csi.c index 052172017b3b..e79657920dc8 100644 --- a/drivers/staging/media/tegra-video/csi.c +++ b/drivers/staging/media/tegra-video/csi.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c index 79284c3b6cae..4add037537a2 100644 --- a/drivers/staging/media/tegra-video/vi.c +++ b/drivers/staging/media/tegra-video/vi.c @@ -11,8 +11,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/drivers/staging/media/tegra-video/vip.c b/drivers/staging/media/tegra-video/vip.c index a1ab886acc18..4cf3fde7e034 100644 --- a/drivers/staging/media/tegra-video/vip.c +++ b/drivers/staging/media/tegra-video/vip.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include diff --git a/drivers/staging/most/dim2/dim2.c b/drivers/staging/most/dim2/dim2.c index 44d3252d4612..ed6a9cc88541 100644 --- a/drivers/staging/most/dim2/dim2.c +++ b/drivers/staging/most/dim2/dim2.c @@ -8,7 +8,6 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include -#include #include #include #include @@ -21,6 +20,7 @@ #include #include #include +#include #include "hal.h" #include "errors.h" #include "sysfs.h" diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c index 220e157d4a5e..58887619b83f 100644 --- a/drivers/staging/pi433/pi433_if.c +++ b/drivers/staging/pi433/pi433_if.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include