From nobody Fri Oct 28 17:32:52 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MzV4P0qy2z4gf5r; Fri, 28 Oct 2022 17:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MzV4P0Cbjz44Fd; Fri, 28 Oct 2022 17:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666978373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/hJ7pRnIi4e3PDIxoAptoFyGNnNuHfY1Je+OMXmVMNU=; b=p9CR9UCTC/AyDoCqQD1EXNd38oEb+O1CvY4ozazIlwZtdxyvPrbAIRv7k9cfVQuzpiXvvt UX6AOoDYmyUs4PipX/1lwkz2NObKTuY18S2hS5o2tRPjRLMR/vEXphBe4C0wGtf0VKMjrx LGDnEnwBHWwd12dcNK5M7pGaG/HN/Be21pF9c6hzpm5zQNf6rLbMUs4iWEUONHsKlq0zmi SpJMofKqoLWzUOo05YqrESkrIJPZfp7ndL56wy6IDGbZvr8ipLXMYksJdsrhiyq3XQHQl4 oRXeC5uP3laaFjPlRHIPZW9VDZQGf/v0ZTPUs4qzuDA15WV9mR/EpB9wbw7Q5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MzV4N6RKDzmCC; Fri, 28 Oct 2022 17:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29SHWqpA025043; Fri, 28 Oct 2022 17:32:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29SHWqjI025042; Fri, 28 Oct 2022 17:32:52 GMT (envelope-from git) Date: Fri, 28 Oct 2022 17:32:52 GMT Message-Id: <202210281732.29SHWqjI025042@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 78e60ba04ab3 - main - Only include phydev_if.h when needed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78e60ba04ab3a875a8ee2a9134ce2abd0f9f4a21 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666978373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/hJ7pRnIi4e3PDIxoAptoFyGNnNuHfY1Je+OMXmVMNU=; b=Hww2nMLRyKFc+DKoOPjd+XP/5mkIcHmzjAxME0skUDe79Tqs5zQa9VkrLDn23DKiMiRdQK 0JgV5drJhpetzjf5giusjBQBleYv5idrH0NH04BLObVUWPDVRmqkKKJJhouXkc8zIXVuDA 9qkvVydpMTsVWvG288gkFnQ9rrhYLuidkxj9SD5id8XmXtfBSkcpYEcPBleE7N83WiR/P/ YTAr4h7KbXLVhQ6x6QokJJGVoDkTe7EH4+bT2UThEJrd7TfRewj2+hrsAZJB6Q3HatEvhl Qq8P7vengT1PdjJkQD1JEeKAwN5d4HUFkJLNwSu5g6UqiCCEJlMBpi1Ix9lJDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666978373; a=rsa-sha256; cv=none; b=SBIhcpTkgejYlnOpnSnGZdGPl5D0myDSDIUxfENkrAUCpk/mpSczLrqr1dDFsSLNk1jv0a dXoZDlfrmfXCwqiG61uTweqNqwsRqqEKrH6fU7J/YOwLJHD2q7b16c7j7hTFMOinVnsI3L UUsiUoyLroFOG7bToAb5jfatkc79qxsG4MwFu98u8wn0cBEyGsjlMV3A5jWRwB7ljNgkRP Yna2cYpZVk1wJdki31LjsqTwba6bVb8JfPFg3ejHMz+1RxfSJ5T2pUeUAnYY3CEAABZh3u DH4n85KXWeDXqMu1Gl2Etl3y54JpWjxpiqSqOxtlr9qbwhgoYUrSfbW5O2gWWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=78e60ba04ab3a875a8ee2a9134ce2abd0f9f4a21 commit 78e60ba04ab3a875a8ee2a9134ce2abd0f9f4a21 Author: Andrew Turner AuthorDate: 2022-10-28 17:13:38 +0000 Commit: Andrew Turner CommitDate: 2022-10-28 17:31:55 +0000 Only include phydev_if.h when needed We only need to include phydev_if.h in phy.c when FDT is enabled and don't need it at all in phy_usb.c. Sponsored by: Innovate UK --- sys/dev/extres/phy/phy.c | 2 ++ sys/dev/extres/phy/phy_usb.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/extres/phy/phy.c b/sys/dev/extres/phy/phy.c index 0d61ac4827c2..0ed633ffbe41 100644 --- a/sys/dev/extres/phy/phy.c +++ b/sys/dev/extres/phy/phy.c @@ -45,7 +45,9 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef FDT #include "phydev_if.h" +#endif MALLOC_DEFINE(M_PHY, "phy", "Phy framework"); diff --git a/sys/dev/extres/phy/phy_usb.c b/sys/dev/extres/phy/phy_usb.c index ce25993482a5..5a1ec7bfe53d 100644 --- a/sys/dev/extres/phy/phy_usb.c +++ b/sys/dev/extres/phy/phy_usb.c @@ -38,8 +38,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include "phydev_if.h" - /* * USB phy controller methods. */