| Message ID | 20220516134057.72365-1-guozhengkui@vivo.com |
|---|---|
| State | New |
| Headers | show |
| Series | [linux-next] net: ath: fix minmax.cocci warnings | expand |
Guo Zhengkui <guozhengkui@vivo.com> writes: > Fix the following coccicheck warnings: > > drivers/net/wireless/ath/ath5k/phy.c:3139:62-63: WARNING > opportunity for min() > drivers/net/wireless/ath/ath9k/dfs.c:249:28-30: WARNING > opportunity for max() > > Signed-off-by: Guo Zhengkui <guozhengkui@vivo.com> > --- > drivers/net/wireless/ath/ath5k/phy.c | 2 +- > drivers/net/wireless/ath/ath9k/dfs.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Please split this into two patches, one for ath5k and one for ath9k.
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c index 00f9e347d414..5797ef9c73d7 100644 --- a/drivers/net/wireless/ath/ath5k/phy.c +++ b/drivers/net/wireless/ath/ath5k/phy.c @@ -3136,7 +3136,7 @@ ath5k_combine_pwr_to_pdadc_curves(struct ath5k_hw *ah, pdadc_n = gain_boundaries[pdg] + pd_gain_overlap - pwr_min[pdg]; /* Limit it to be inside pwr range */ table_size = pwr_max[pdg] - pwr_min[pdg]; - max_idx = (pdadc_n < table_size) ? pdadc_n : table_size; + max_idx = min(pdadc_n, table_size); /* Fill pdadc_out table */ while (pdadc_0 < max_idx && pdadc_i < 128) diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/ath/ath9k/dfs.c index acb9602aa464..11349218bc21 100644 --- a/drivers/net/wireless/ath/ath9k/dfs.c +++ b/drivers/net/wireless/ath/ath9k/dfs.c @@ -246,7 +246,7 @@ ath9k_postprocess_radar_event(struct ath_softc *sc, DFS_STAT_INC(sc, dc_phy_errors); /* when both are present use stronger one */ - rssi = (ard->rssi < ard->ext_rssi) ? ard->ext_rssi : ard->rssi; + rssi = max(ard->rssi, ard->ext_rssi); break; default: /*
Fix the following coccicheck warnings: drivers/net/wireless/ath/ath5k/phy.c:3139:62-63: WARNING opportunity for min() drivers/net/wireless/ath/ath9k/dfs.c:249:28-30: WARNING opportunity for max() Signed-off-by: Guo Zhengkui <guozhengkui@vivo.com> --- drivers/net/wireless/ath/ath5k/phy.c | 2 +- drivers/net/wireless/ath/ath9k/dfs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)