From nobody Mon May 16 12:09:40 2022 X-Original-To: dev-commits-src-all@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 7CBA31ADDA27; Mon, 16 May 2022 12:09:41 +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 4L1yjc6vpJz4cbK; Mon, 16 May 2022 12:09:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702981; 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=h26C6ELoiHMTzHDkdr9wJWE7cKNfZGT7YfNixeAUrnA=; b=eoqWSZNOJEIxOz6vLSZ5dZ8kHBxCLrlAyg0hFf2HdEpxNwhjJ+5c6Qco7sOnmlXr8JV5Qc nG+JhSSAktyfpJYP9hmDGnNcy2x6jIHu7NRPVrmTNs6ai3NtcLaNfuW72xYIARmV9nA1/J WOriXFcmmcDRPkkq90To5R6JEw50HIMTf9iDKz871hgzurcW7d1vqR22BmZHHhrEC1/8ss Q/0UaYNmgMHhHoyW6/tdSdCv/CRoLywrMVjBb3sYpSWb5XisJ3HUIGFgvmspPuJEQOJS44 Aljk5gfbwLlOxKcaSuVHu1Xbw5bBh4XWGuukU7ncdbglmFl8lhppnG/9rtQ5Nw== 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 793801FBAC; Mon, 16 May 2022 12:09:40 +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 24GC9evb035175; Mon, 16 May 2022 12:09:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GC9e4l035174; Mon, 16 May 2022 12:09:40 GMT (envelope-from git) Date: Mon, 16 May 2022 12:09:40 GMT Message-Id: <202205161209.24GC9e4l035174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 354beb15b738 - stable/13 - twsi: Make ext_resources non-optional List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 354beb15b738508b4f314da68096f479e6f6deba Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702981; 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=h26C6ELoiHMTzHDkdr9wJWE7cKNfZGT7YfNixeAUrnA=; b=hGWjua2gByxYD8gXIGXVlutXSLo27AkhU0yiZ61tDsJthoRIwmd0QDZPNX90Jn9zgTSXJe kJyOg3HnQhKvDqros21hwUjV/HtcjbtDNaDecbTAd2Oiy2to2kFHAkV0CncvLFngIS2Pgg ki6TjczwpRvPykAfP6HS/NpIIWTSsEqFO+Kdu5SSjo/ICrJOMMkTb/5je8j1UlTTf4y8xs 7dd/xRmjyLhiE48+7SqnnD4UR4zpQq3uqmwWK1AVqjakuCXI5WIze8efv2528TjEoSP7/7 5bz1eDxbFrFbHaZoDL7003YIIsDbOj6lQdaAk0ulyj4RKj0UWFMeZUwSN6HxZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652702981; a=rsa-sha256; cv=none; b=kJf/i6qz9UaL6pJbRePPx+CcldB51TIh3DxI6mrVaXVe6UtsCGuSRvf2C+ZeRsZj9NoCGn wf3WXUwzajHOG2HakFRGHNwTKZOWynkGK73BD80NmwwrWnZZ6uKCRCpJ9+jFXresS+vtRR ahnmsDpARu7heAZLIOa1qEERiK/rD6JBgtD1dOenDC+ENZsyiXYVNJT9sN/XFQaK6LYE4i 7eVNF2T5WxquoqoK3aO1qpxn9hI24pZwv3LgB+VCBqYINZB3Sez/EDis/s7hlpyIayEsvW gdCFUDmlDYBAiSygzCHU0moqRsGkfly8ASH+/y9AaoJNK2OXW5/YECazqEwrhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=354beb15b738508b4f314da68096f479e6f6deba commit 354beb15b738508b4f314da68096f479e6f6deba Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:39:47 +0000 Commit: Emmanuel Vadot CommitDate: 2022-05-16 11:45:35 +0000 twsi: 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/D33823 (cherry picked from commit 36498b14083d5be64052e65bd7d1c81c1352dce4) --- sys/dev/iicbus/twsi/mv_twsi.c | 2 -- sys/dev/iicbus/twsi/twsi.c | 8 -------- sys/dev/iicbus/twsi/twsi.h | 4 ---- 3 files changed, 14 deletions(-) diff --git a/sys/dev/iicbus/twsi/mv_twsi.c b/sys/dev/iicbus/twsi/mv_twsi.c index cb10c1045347..97ed63524b9a 100644 --- a/sys/dev/iicbus/twsi/mv_twsi.c +++ b/sys/dev/iicbus/twsi/mv_twsi.c @@ -61,9 +61,7 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef EXT_RESOURCES #include -#endif #include #include diff --git a/sys/dev/iicbus/twsi/twsi.c b/sys/dev/iicbus/twsi/twsi.c index 91433f2cfe4a..3baec3944fee 100644 --- a/sys/dev/iicbus/twsi/twsi.c +++ b/sys/dev/iicbus/twsi/twsi.c @@ -246,7 +246,6 @@ twsi_locked_start(device_t dev, struct twsi_softc *sc, int32_t mask, return (IIC_NOERR); } -#ifdef EXT_RESOURCES #define TWSI_BAUD_RATE_RAW(C,M,N) ((C)/((10*(M+1))<<(N))) #define ABSSUB(a,b) (((a) > (b)) ? (a) - (b) : (b) - (a)) @@ -281,7 +280,6 @@ twsi_calc_baud_rate(struct twsi_softc *sc, const u_int target, return (0); } -#endif /* EXT_RESOURCES */ /* * Only slave mode supported, disregard [old]addr @@ -291,17 +289,13 @@ twsi_reset(device_t dev, u_char speed, u_char addr, u_char *oldaddr) { struct twsi_softc *sc; uint32_t param; -#ifdef EXT_RESOURCES u_int busfreq; -#endif sc = device_get_softc(dev); -#ifdef EXT_RESOURCES busfreq = IICBUS_GET_FREQUENCY(sc->iicbus, speed); if (twsi_calc_baud_rate(sc, busfreq, ¶m) == -1) { -#endif switch (speed) { case IIC_SLOW: case IIC_FAST: @@ -315,9 +309,7 @@ twsi_reset(device_t dev, u_char speed, u_char addr, u_char *oldaddr) debugf(sc, "Using IIC_FASTEST/UNKNOWN mode with speed param=%x\n", param); break; } -#ifdef EXT_RESOURCES } -#endif debugf(sc, "Using clock param=%x\n", param); diff --git a/sys/dev/iicbus/twsi/twsi.h b/sys/dev/iicbus/twsi/twsi.h index ed0ea72ab819..d61a1eb5aa09 100644 --- a/sys/dev/iicbus/twsi/twsi.h +++ b/sys/dev/iicbus/twsi/twsi.h @@ -34,9 +34,7 @@ #ifndef _TWSI_H_ #define _TWSI_H_ -#ifdef EXT_RESOURCES #include -#endif struct twsi_baud_rate { uint32_t raw; @@ -50,10 +48,8 @@ struct twsi_softc { struct resource *res[2]; struct mtx mutex; device_t iicbus; -#ifdef EXT_RESOURCES clk_t clk_core; clk_t clk_reg; -#endif void * intrhand; bool have_intr;