From nobody Mon Feb 21 16:29:43 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 EAF4319DDD20; Mon, 21 Feb 2022 16:29:43 +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 4K2SSR6J2yz4grH; Mon, 21 Feb 2022 16:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645460983; 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=WdbftsEXnZNQ4ioE8y+OLr6EY3ERkIkdA4wY7EEUrZc=; b=cqNC40m/QxqWqLuwnNOlNkbas5IPygU4tVt77RnOumfHwp3yi2yvzrq+H/Agk7OAdwHNii GTR7m3+DAqaz/4bnk2nbnRw0jbJYi4I/LYXT0bNfBpGjAIigcT6B7RN9IHPj9mh++FFJkP aZQTJ1vLc/WycXplQuF3mtrw5WLp8QL5dw1L0nCYdePeJt0PVv5bMaa/zmWrg6Qbyeji+f xSWrRYcrCvpWYrnlbs0VNfBiYl0inFaH5ohTtegpyBQJd6kSsCwVB3AJYwNQDZNjssd19B 2XbE8FmWi38lst1Jbev8CyXu9vxQVQZrA0+JXW580jAeH0DvsrazXa7HA93Ytw== 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 B875E137CF; Mon, 21 Feb 2022 16:29:43 +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 21LGThHu008279; Mon, 21 Feb 2022 16:29:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LGTh95008278; Mon, 21 Feb 2022 16:29:43 GMT (envelope-from git) Date: Mon, 21 Feb 2022 16:29:43 GMT Message-Id: <202202211629.21LGTh95008278@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: a5339ba3ff14 - main - dwc: Make ext_resources non-optional 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5339ba3ff147618e21f45a11f062ccb9fadafb2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645460983; 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=WdbftsEXnZNQ4ioE8y+OLr6EY3ERkIkdA4wY7EEUrZc=; b=LuO7QVXe3L27y//9qZYUVOOyGsca7EYh2Eo26yY3j0jJLZZ+QChGZMrleJYXUaWP2UQ7tm mYHKQ1hXlInM/zmLoOxLDLsA8z7f1bDMJCUTUN0A5RRuOBxhFhRiatKC4RqfuAzpUZOuzW 2dHc87yyqOjaYi/c0PUFF6e6cMjFl2RFE5c7ITMkqX2TCnJC5IEZFW9lSHWga79IJyLBmc pHBRRBtjQxWk/xXZ05wja5W+dPjA2ltmBasmHARDmhh6PKUq17vU70l1MjdzGyueIeTeeH oRsRgRzftbsMq7kAEHkpSaFSA+4rgIzN/nb9FWC+5LSF9Wat0lmmEdxFU+KABg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645460983; a=rsa-sha256; cv=none; b=eRsLqI2u3JINWgDkrVYIq8oqEdF/bGkLN/0pGp2a06Ur5VfyVtwzXvZRcy53UrKp9O6zJN tnt2Gvb4cW+cKu9pBHuOrtXjmYKyyLGtpNiDPOqFsXmAS1p5Lnc0YXOcNegEFzJe7xdnAW rzrM0LGqQ26+C62S2ntnN04aW9e4zov2EAlXi7wZaU5pX0mp930oJDbxyExWoofFNGLN2V xmVcU5cTbJO3RQjVL7XqqVyFRR8IjHnJHb2MXu2uHQvvcp/tlNUdgJ8+Nnxj1gy0j3aClE 26/EbNqjCsOB2RMi4S1mZ62erZndfglJSOBzS0ltSaxbSJMaZkeSz5Iv9waX3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=a5339ba3ff147618e21f45a11f062ccb9fadafb2 commit a5339ba3ff147618e21f45a11f062ccb9fadafb2 Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:34:36 +0000 Commit: Emmanuel Vadot CommitDate: 2022-02-21 16:28:37 +0000 dwc: Make ext_resources non-optional EXT_RESOURCES have been introduced in 12-CURRENT and all supported releases have it enabled in their kernel config. MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D33820 --- sys/dev/dwc/if_dwc.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index d1a536639304..703c210a8f87 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -71,10 +71,8 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef EXT_RESOURCES #include #include -#endif #include "if_dwc_if.h" #include "gpio_if.h" @@ -1497,7 +1495,6 @@ dwc_reset(device_t dev) return (0); } -#ifdef EXT_RESOURCES static int dwc_clock_init(device_t dev) { @@ -1534,7 +1531,6 @@ dwc_clock_init(device_t dev) return (0); } -#endif static int dwc_probe(device_t dev) @@ -1601,10 +1597,8 @@ dwc_attach(device_t dev) if (IF_DWC_INIT(dev) != 0) return (ENXIO); -#ifdef EXT_RESOURCES if (dwc_clock_init(dev) != 0) return (ENXIO); -#endif if (bus_alloc_resources(dev, dwc_spec, sc->res)) { device_printf(dev, "could not allocate resources\n");