wifi: mac80211: scan: Use max macro

When the original file is guaranteed to contain the minmax.h header
file and compile correctly, using the real macro is usually
more intuitive and readable.

Signed-off-by: Yan Zhen <yanzhen@vivo.com>
Link: https://patch.msgid.link/20240827103012.3853588-1-yanzhen@vivo.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 3b2bde6360bcb6a0d4e2e7db759de1d81748c4c8..14e18fd9e91915cdbc7349ec2e86dac03a4d91e4 100644 (file)
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -1013,10 +1013,8 @@ set_channel:
         */
        if ((chan->flags & (IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_RADAR)) ||
            !scan_req->n_ssids) {
-               *next_delay = msecs_to_jiffies(scan_req->duration) >
-                             IEEE80211_PASSIVE_CHANNEL_TIME ?
-                             msecs_to_jiffies(scan_req->duration) :
-                             IEEE80211_PASSIVE_CHANNEL_TIME;
+               *next_delay = max(msecs_to_jiffies(scan_req->duration),
+                                 IEEE80211_PASSIVE_CHANNEL_TIME);
                local->next_scan_state = SCAN_DECISION;
                if (scan_req->n_ssids)
                        set_bit(SCAN_BEACON_WAIT, &local->scanning);