From patchwork Tue Oct 10 20:56:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 150958 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp131489vqb; Tue, 10 Oct 2023 13:56:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHmH38AUYgXZxR7LBGhbhLEKXtl7pIl6RriXsCkklpP8zDKFbhDCosi0+gifFB4AAQ0+YLf X-Received: by 2002:a17:902:da87:b0:1c6:2902:24f9 with SMTP id j7-20020a170902da8700b001c6290224f9mr22256792plx.1.1696971414344; Tue, 10 Oct 2023 13:56:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696971414; cv=none; d=google.com; s=arc-20160816; b=maHU9co6cfKVNSzZKHnZ11xMHfAj8Qal7AUMVDKTwd1/C6lEbZeRdrpnn2aJQXOw74 riKZCTkRXbnExH3BXcPWaMZ8ufXY5DLf1v+ZjcLcBnr/PAjJZtb4OpYDVlCS3XpQcsea QDP4v2zwei1kiy4yYdnbKCz9qlohc8dtXxFZxHPnz+UHUDhX09vM3Ukcj/W8yP3KStFm zu/9EbdJRxJ1cM6bjg4i54vNke/W3HDTcvys1d0+eb+Ewe5hcpyfp/xJgFCam0AicaV9 SqSwKmpaF7yu/thM0DsU6JjMoc1B3DuB2g/4Mz2dDiDzZ/Pj+AMpYtbWmTA+nhNcuMHc 5ohA== 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=+ipIIBh7TYC/KG8exZRmCp33VSVFsatBOgJVGR9HBpE=; fh=ujjDPh+muKxLDyTHhM85C1cKMKV0vVjq4pRKJWaTZ7U=; b=QrN4oCbpuIqRkgFpkzmjOx7JhBbSQSL/W1l/tQR9mqGWKTJ8v2WEe1TWPkIuX1suU/ E2+LWsL9GBRRTRWXRdQ0bOhnjJ1w1cPcuLdScg3+FpU0B9Yae8vFQAe4TVyslvogOOP6 t1I9JtAZ61KdDK9sfRuf0tjAd/6v5EVY8ZVLCtxIQpBb1w+YvnWkk2TsfauaB58gccSZ ZDdBnmykqvBbqNNA2L84/edC7WdIZnL/SwhjacfxIQd11yE3DRZcX/cxi0J1CUE3shHU yoXgwU430nxhfEO4zxeBYOFrImh1F7TkCrj4bDDepyH8LrFhMJ2aa7NbvPbHe6vhbq0/ raWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=utaB4KpV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id e18-20020a17090301d200b001c45e1f034esi13339326plh.141.2023.10.10.13.56.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 13:56:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=utaB4KpV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 5AEEE804BDC4; Tue, 10 Oct 2023 13:56:53 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343707AbjJJU4u (ORCPT + 19 others); Tue, 10 Oct 2023 16:56:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229689AbjJJU4t (ORCPT ); Tue, 10 Oct 2023 16:56:49 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE3838F; Tue, 10 Oct 2023 13:56:48 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06A61C433C7; Tue, 10 Oct 2023 20:56:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696971408; bh=y2fTlo3zezzxE1nBSUjqMG6g4xIuKutp9SXd4X2X+Kc=; h=From:To:Cc:Subject:Date:From; b=utaB4KpVk23rFwgM5Yy71oSXCTNJZgBsgCHOmI/kMUozWzGChFLGVrgvgXd/pgroz Wv8vhfa30/p3Wu1iyvuqIGF1Iy6SjJO1f3SIte3MA1j+YBRt+G/Nte5kGsKUuB1NNv rlyzwmDTSkMFoOA8xMd6OIxALCxY0GwTfoU2OI//6MrWhs/lAmf4CwyTn+7QlWawkv oDE81a1K1aRJJQ6r+Ur6ON5qCyChjn7Kpt26xNCCL5o7yhmmc0VLxzH5DqRH3jd5nZ UGgB+0V7FnC9nbMk7OhafqmeP+OXDUJG0jBxje/5ne8EXrmmPWSera9QsLojLRih8w in4WKa/SfYjQA== Received: (nullmailer pid 1584728 invoked by uid 1000); Tue, 10 Oct 2023 20:56:46 -0000 From: Rob Herring To: Wim Van Sebroeck , Guenter Roeck Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] watchdog: marvell_gti: Replace of_platform.h with explicit includes Date: Tue, 10 Oct 2023 15:56:36 -0500 Message-ID: <20231010205636.1584480-1-robh@kernel.org> X-Mailer: git-send-email 2.42.0 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 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 10 Oct 2023 13:56:53 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779403497734381287 X-GMAIL-MSGID: 1779403497734381287 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 and pull in various other headers. In preparation to fix this, adjust the includes for what is actually needed. of_platform.h isn't needed, but of.h was implicitly included by it (via of_device.h). Signed-off-by: Rob Herring Reviewed-by: Guenter Roeck --- Note this was added in the merge window and missed the last round. --- drivers/watchdog/marvell_gti_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/marvell_gti_wdt.c b/drivers/watchdog/marvell_gti_wdt.c index d7eb8286e11e..01e9177cbf20 100644 --- a/drivers/watchdog/marvell_gti_wdt.c +++ b/drivers/watchdog/marvell_gti_wdt.c @@ -8,8 +8,8 @@ #include #include #include -#include #include +#include #include /*