From patchwork Mon Jul 17 22:54:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 121631 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1397887vqt; Mon, 17 Jul 2023 16:15:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlHBGSuSCORFuyFjlOhtZKTDa/b5OeR9G2hT2oPSpTFEsvo+qHSmS5Pv7hpu0q8UrD6X/c5j X-Received: by 2002:a17:906:52da:b0:992:16bb:2b6e with SMTP id w26-20020a17090652da00b0099216bb2b6emr9960261ejn.29.1689635715288; Mon, 17 Jul 2023 16:15:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689635715; cv=none; d=google.com; s=arc-20160816; b=vMYsVOVGtWCWxeyZPP8gwdFA+5HHr7okFLCLsonIFqDYMQ2Ae/1OvU+qXIyeFjJ1+G XCr4gzJXTNKTOyNPzSoV5aJ4AoV9xB0hU6dtoS8VPrGDHTRgLO1237ALQTCqhmcPykay FSr6hSEI9tL7N5IeyoTljgR3wZ/XTOdawdOblCjjvtTNSDvpjDxVK38FhoRzHS+nr0Rw CbcTseVmNhcNT5cGMBOuuztblcfosXm9TFnTj4b54tyzSqPkH1LEY59o+2UZEEPPg3bY f4ll2AaUHCEQZ2y4jbd/wDXmu6Qf33QanbYbhxfJ2fImwqP7fIeBkpS8mC746CZ/Olmh WMKA== 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=ymYn/x+gFr9Uap3Oyjl6lqOUE5lXkOjex1xFd1KzXoo=; fh=2XKXLD5eBuOrQmsHasEZwbQzSQdM4T1eTz8pwcW/CTI=; b=hUmf4VrvxAxx3h4T9vv4FS6Zxo8Mb5ikZDONNJoQOsTkV2nOpkqHiqXUhAfl9HcHFC dhwCfXicQxvDZ335l/lExgZwlozocy+P9rgz8PGCX3HQw89Yj5hWcjAe6mirl634IY5T 9ytb7Zw1543Tb60TkIWSp9mJAvn/sQUgjpApQ5MoZkDx1njlEw72xbTMNDdldYxchxq3 L5PyikdMfUgFJIyEYkB32qCdYZEfXE6JblD5szxxMs491Tvc9gGKi8jk2aeR+961tmbO DFaLC01h3S1LPm1W0yKl4I1y2JfTa2KtHyhfkvX1xpWnlqRPCEJ054xrwpy2KrCugpra eSCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="ZF/V9Rh7"; 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 a3-20020a170906368300b00993ee77a3c4si275144ejc.681.2023.07.17.16.14.51; Mon, 17 Jul 2023 16:15:15 -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="ZF/V9Rh7"; 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 S230523AbjGQXA5 (ORCPT + 99 others); Mon, 17 Jul 2023 19:00:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229722AbjGQXAy (ORCPT ); Mon, 17 Jul 2023 19:00:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC60219A1; Mon, 17 Jul 2023 16:00:24 -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 8D3F6612E4; Mon, 17 Jul 2023 22:59:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EBBBC433C8; Mon, 17 Jul 2023 22:59:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689634797; bh=f4dpWd1j2PaSct6KkkWMV6D3aNGQhrnp1Irz3n7TOxo=; h=From:To:Cc:Subject:Date:From; b=ZF/V9Rh76Uvzf5bLkDsX24rckkexgIKjmNcJnH6XqXWX18l5UZpOgWdjNDld3qNBU u67beRicWG5tR1H4XZxwfWEJXLYGQKGvG+75ud2Kgwk/B0YeCtLBckRZl2zB/x5ypz wsJzgOZymTf5njooRRc9XAizbOg4vK/gYEaFb8z0XKE+TMQgfrBbwnJwpIZQpiMHt6 HvFDKAq+h+59nFh9HWF9pjQuqkLj0UCN7rXnv5eH0YVnDGC1rnwvQmBelALxuF/E2m oy+04VYNVQQuBJxBEYPreftMWNQ9ELMpV2iy3D0D50sfz4zmznMPsbUzLFatEMsLZT /JI0Fq/8r4/Sg== Received: (nullmailer pid 3211975 invoked by uid 1000); Mon, 17 Jul 2023 22:54:54 -0000 From: Rob Herring To: Tony Lindgren , Russell King Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: omap2: Explicitly include correct DT includes Date: Mon, 17 Jul 2023 16:54:52 -0600 Message-Id: <20230717225452.3211901-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: 1771711459644201026 X-GMAIL-MSGID: 1771711459644201026 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. --- arch/arm/mach-omap2/board-generic.c | 3 +-- arch/arm/mach-omap2/omap4-common.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 10d2f078e4a8..fde6ccb3df6e 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -9,11 +9,10 @@ * to support the OMAP2+ device tree boards with an unique board file. */ #include -#include -#include #include #include #include +#include #include #include diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index d9ed2a5dcd5e..5d924b85b694 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c @@ -12,10 +12,9 @@ #include #include #include -#include #include +#include #include -#include #include #include #include