From nobody Mon Feb 21 16:29:47 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 9F9A119DDBE4; Mon, 21 Feb 2022 16:29:47 +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 4K2SSW39mxz4gm4; Mon, 21 Feb 2022 16:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645460987; 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=txvs6KVeb8Vb95XmLZ9uCtMLvHnEhxvHIVoC+47C1o8=; b=MUWPFE9AfSKqxN0BsQYhYl+Fl/rlTiGfmBAMKDtWAaKor6pUSU6bXtV6Y9lNwQaU+EQRGh 1eTD00tlGlRAPfFHr+D9lg35Am3jIG5dTvecDGSWDKI6cK7o1wtxDEdiWh/dEeRzsT/ybk YdmGXKrR1Ter+DMqOdehlGmmhl46HgPS7hPqowlAkxzT1nilXLipmtnCYEw1kCiyLK7js9 ZhGrAhaaNX3hBC7kXfsENzBTh7ajbHfWQz5ZtwLu0Jsi9aQJmZd+S41wukdurwUGNXxPGU kU0r3yTMwrXABiccX3DL6s0YDGsOUghpv2r+RyVMPCIl5iymBU0SqnOUeIRxxA== 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 2A0811399E; Mon, 21 Feb 2022 16:29:47 +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 21LGTlDA008358; Mon, 21 Feb 2022 16:29:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LGTlS6008357; Mon, 21 Feb 2022 16:29:47 GMT (envelope-from git) Date: Mon, 21 Feb 2022 16:29:47 GMT Message-Id: <202202211629.21LGTlS6008357@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: 36498b14083d - main - 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/main X-Git-Reftype: branch X-Git-Commit: 36498b14083d5be64052e65bd7d1c81c1352dce4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645460987; 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=txvs6KVeb8Vb95XmLZ9uCtMLvHnEhxvHIVoC+47C1o8=; b=Y4mUVTi2bXMmo1IMCKT4VilNoURmcvA+UDHHXHZiRUtLTEP6oFkGgMSw9NPKfwSOMCfiE+ kWV4yoXKudVZAyueOrCRB1uWOn2Cmz3vcTIfTMvgEVz0/AypllkipZez8i7a9S4nYe7qI9 r5C6K6y06hGBfHPyGucThNIhvtwHHzCOwD/a7QNYhOVWbiZvbdkP1wfHPbX5FhZVC7QIeV 9djabJu20oTO9PCFMqJjLNjVQWeJJGvc0a7oORBz+up75WRjR/HgS/uSBjKce0GL3Y3b1l m9fpF+vDCtHQuToPundmc/zpjlzE+OguHRKaBEPAnS1yMt8vJh05jZGwamUQow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645460987; a=rsa-sha256; cv=none; b=qgiHuuHk45jEN8A13B7EpJxGPVLz0qvv3d2TbjhjGBacpSeTANiSuhS/j0JykYAhaxSJG9 PCbxGTcoccR3wxyZY4090Le1FvPAnrf0QOIVz96GQDJYnnTrDAfRy8ONQkxygUAkhqonP5 1lgnNOH3daEZF6/5oWsL/w4yqgIEKU9Niw4tnCndvCnM80s4kb5PMvKJnDd6E9o4ft6d7Z DEUc6oRPMGkc7e1xFA2VrC2Mr7XRqPRLVrcJEvN5X+UOeKdQN/UjOSBfFvYD4tD0Xii+/J Etv5lfLqkj9HN8H8y7+wP1gJN+VAIfBBBIG4WI5GLHl42z4q4njLlxAw/9nCJg== 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=36498b14083d5be64052e65bd7d1c81c1352dce4 commit 36498b14083d5be64052e65bd7d1c81c1352dce4 Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:39:47 +0000 Commit: Emmanuel Vadot CommitDate: 2022-02-21 16:28:44 +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 --- 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 793b674730ed..7ad6ee68827f 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;