From nobody Wed Feb 23 01:05:31 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 D28E919DDE9F; Wed, 23 Feb 2022 01:05:31 +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 4K3Hs751JWz4gTV; Wed, 23 Feb 2022 01:05:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645578331; 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=O09g2AmKEEMtQ0MbgtU03qQKy5cwfRzSIonj5+3XEfw=; b=GdAiPraQAc0SsvnB5glwQ42ENHjOSQuoHHns0s1McA6kN2hq0LLutngg1KR03tjUOG/r+B oRC+oFXFU1tvY3QyhGLNvxaLStOP5b6xon9dIPM+/ejx2rfvOoKHGsNZ7qEgKmntuZbJfG IwSMvh/jqei5+go2ShJO9JG3EqZFHrn9cSiZFq/6EVH6craLqKltvRTyloZx0TPAe6MkF3 VsomHXU4kJqva2noHicySNUW6C7MzN6oP+TeyWJf8PuCDdKCedOjHQ7DCl7WFutg3n71A3 L4GYo3CjzSEXeosDDcJbH6WrDKyJowAW/mcS3VLo4pJmx8TRpQu2vjqseRdkXQ== 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 8CAE36E14; Wed, 23 Feb 2022 01:05:31 +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 21N15V8A047597; Wed, 23 Feb 2022 01:05:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21N15Vh5047596; Wed, 23 Feb 2022 01:05:31 GMT (envelope-from git) Date: Wed, 23 Feb 2022 01:05:31 GMT Message-Id: <202202230105.21N15Vh5047596@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 4efab785f6c4 - stable/13 - rtsx: Prefer __FreeBSD_version over __FreeBSD__ 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4efab785f6c4eacc6b3131fd113a4b0a1d337ebb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645578331; 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=O09g2AmKEEMtQ0MbgtU03qQKy5cwfRzSIonj5+3XEfw=; b=MFIlksLLGKJv8+nKB3+K0umST6neF+6A03+OKwlZ6B+A3wyntPmV3w2LVZhGBP8iqueJQp nE8006HF5l6/IHRWr+2djnllqmogR2nOphmqBstN253/lgeoTZsUkryyjqTGydoqWPJoZH os+Nxtl0Q2OBvLKU/Q/bkSTKuTIkrCsc/afFjJvq1DluBv6b72nBfUZWlxhck2/4zJ/kfU w6Ee3ctan2FXjU9NW4HHcjrDJ9KVv6K+z5xbwNm16YEag09FU/2Xs29tXjzzN7YmkRbOvN vFWWLbrLniIgtk477OEQF/DC1nWCEZSe2RIrArJ6C0HcWRI5mA1iFJ/db+bt3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645578331; a=rsa-sha256; cv=none; b=LrVAQXVxYD5vTtb48X1lInifdVnV4TyZbisoqjevBuFCwYJ6TZn4w1oB3lMs4E7VNqkHMr mrJlIkZK97kDzCahIgfDlM+j2UbVqifQwKDtdPQYZYnrnO3h4NYEpXDzHAiYlnAj0FV1/R MBC9L5pvneyiSK7XwONse1Ry6QGdHcFg1YT0QPVVAu02Jvz4MHVM72p+hZmJyPWRME4cX0 8gdIrW0XgW+0LsAXW98ufkBr4aieCwzZqRdlSsvuR5P5FQJ0T9tWusrfg9TQ9gq44L1pUj dQaVYv57Frze6mb156ykbaybX65oBNKBAnTCTFDkIAvkivC7a1nHvD3Gd6hgYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=4efab785f6c4eacc6b3131fd113a4b0a1d337ebb commit 4efab785f6c4eacc6b3131fd113a4b0a1d337ebb Author: Henri Hennebert AuthorDate: 2022-02-03 23:10:02 +0000 Commit: Alexander Motin CommitDate: 2022-02-23 00:39:29 +0000 rtsx: Prefer __FreeBSD_version over __FreeBSD__ No functional change. Differential Revision: https://reviews.freebsd.org/D32154 (cherry picked from commit 7e5933b33301c194345364b9cf45d425ea6dbd1a) --- sys/dev/rtsx/rtsx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/rtsx/rtsx.c b/sys/dev/rtsx/rtsx.c index 696149fa039f..ce1909f52c47 100644 --- a/sys/dev/rtsx/rtsx.c +++ b/sys/dev/rtsx/rtsx.c @@ -2905,14 +2905,14 @@ rtsx_set_tran_settings(device_t dev, struct ccb_trans_settings_mmc *cts) if (bootverbose || sc->rtsx_debug) device_printf(sc->rtsx_dev, "rtsx_set_tran_settings() - bus mode: %d\n", ios->bus_mode); } -#if __FreeBSD__ > 12 +#if __FreeBSD_version >= 1300000 if (cts->ios_valid & MMC_VCCQ) { ios->vccq = new_ios->vccq; sc->rtsx_ios_vccq = -1; /* To be updated by rtsx_mmcbr_update_ios(). */ if (bootverbose || sc->rtsx_debug) device_printf(sc->rtsx_dev, "rtsx_set_tran_settings() - vccq: %d\n", ios->vccq); } -#endif /* __FreeBSD__ > 12 */ +#endif /* __FreeBSD_version >= 1300000 */ if (rtsx_mmcbr_update_ios(sc->rtsx_dev, NULL) == 0) return (CAM_REQ_CMP); else