The branch main has been updated by jkim:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=7e5933b33301c194345364b9cf45d425ea6dbd1a

commit 7e5933b33301c194345364b9cf45d425ea6dbd1a
Author:     Henri Hennebert <h...@restart.be>
AuthorDate: 2022-02-03 23:10:02 +0000
Commit:     Jung-uk Kim <j...@freebsd.org>
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

Reply via email to