From nobody Thu Feb 3 23:43:52 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 EED5C19A187C; Thu, 3 Feb 2022 23:43: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 4JqZxj1spTz3RJB; Thu, 3 Feb 2022 23:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643931833; 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=tHtAg5XMRDqercFiS2w9+HCcj0yvqj+sSepjKleJYDA=; b=bEFg7ebs1CmnP15MmjlD1H5EmPdr19/IrsNWS263o5ZVLSj3CrQmFQNRjFl0DoZYdwhto8 EsIi3au9s4TF26E9Hp/TVz5uNdn+6Am2e7SMYihua3XmAh7iJo/VQ+U6pAcEUDJSDEXVl/ vUp5uvWtqY5PPlMjz0n7ZHkAtqPsuA42tr+2sDhLdY1Aln3GEOjsc+01fbRWl+11JESg7A lLjwD6Ii9/MFSzf4kKH8R8FqAtDZdPq1wDEMKj/ZnpXuBoKujBvn/XSEBFLOEM7MP8w3lo tFVmQt78b+66f7x/N7lsNNT2m921Fbpvq6xlueozSEGJVG0MbdiZVRXcESUZ9A== 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 E59C42126E; Thu, 3 Feb 2022 23:43: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 213Nhq0c076674; Thu, 3 Feb 2022 23:43:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 213Nhqot076673; Thu, 3 Feb 2022 23:43:52 GMT (envelope-from git) Date: Thu, 3 Feb 2022 23:43:52 GMT Message-Id: <202202032343.213Nhqot076673@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: 7e5933b33301 - main - 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: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e5933b33301c194345364b9cf45d425ea6dbd1a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643931833; 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=tHtAg5XMRDqercFiS2w9+HCcj0yvqj+sSepjKleJYDA=; b=BWYiCR4PN0xBUZ+jBQl2TkppY6AITdhCQ7m+wgvP8DBcy+JPCVyMmFo3bfyYH/zes54Qdw 8+QuoWmb2+fG1MEseyae71fSPaOHxdEr7tamAihMvyePS+F7gwgPFXcRrPuB2FrQ3Smg2Z fbHougEoWpjBim+ci+7Vqg5KhJjmmPj/a+MSNxMJOh8C9eH7cZL5si2WHT0o8BSd14joD3 godiv56Wy7hhpdWIdW0aeBqjsoWkn1ks+BabpxQ9zKfi/Jb/j7Y8FY65mi5TgUZbjEpJx6 T4mZg0tDISYkJuBHulqeDui7pCtEaNlPl/lSngmPa75TSYav1ExBoLZzceujVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643931833; a=rsa-sha256; cv=none; b=XqJdoEEX/C5Bh7asWGOqIwsNcUuJGgNzHFKH2tVsQgExUqmDGsCF9wF6MGrePyUZFZdkUK WkG45YuAbFNKrd/zTMxJEnYZqoAN5j4c7YP9gjTGvV8g1kCHvuk6ze1KkcYm5XwYp+IeqH yu4Ur5dmW/Pi1CDyVx5Ufulv8H+kKLGXtAbdIG0gGmzIhKzMQ3W5g83qYBUhlmQf1KA4HY MqLDkzgfKIly0FqTPw4IxFVf1h69ASI9PwhQnf3YcWHkBTAXDEeKMHPCxLEayEZq0sF/CS LLx9ITcA9wYv6UKwN4tbITNIxNS8hqsVWtkXIHQ4+Df0aEoTZ939mZKpcrK12A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=7e5933b33301c194345364b9cf45d425ea6dbd1a commit 7e5933b33301c194345364b9cf45d425ea6dbd1a Author: Henri Hennebert AuthorDate: 2022-02-03 23:10:02 +0000 Commit: Jung-uk Kim CommitDate: 2022-02-03 23:43:12 +0000 rtsx: Prefer __FreeBSD_version over __FreeBSD__ No functional change. Differential Revision: https://reviews.freebsd.org/D32154 --- 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