Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6351d48 authored by Pavel Roskin's avatar Pavel Roskin Committed by John W. Linville
Browse files

ath9k: use standard max(), remove A_MAX macro 



Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d3af4396

drivers/net/wireless/ath/ath9k/ath9k.h

+0 −2
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ struct ath_node; 
		(_l) &= ((_sz) - 1);		\

	} while (0)



#define A_MAX(a, b) ((a) > (b) ? (a) : (b))



#define TSF_TO_TU(_h,_l) \

	((((u32)(_h)) << 22) | (((u32)(_l)) >> 10))

drivers/net/wireless/ath/ath9k/rc.c

+3 −3
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ static u8 ath_rc_setvalid_rates(struct ath_rate_priv *ath_rc_priv, 
					[valid_rate_count] = j;

				ath_rc_priv->valid_phy_ratecnt[phy] += 1;

				ath_rc_set_valid_rate_idx(ath_rc_priv, j, 1);

				hi = A_MAX(hi, j);

				hi = max(hi, j);

			}

		}

	}
@@ -569,7 +569,7 @@ static u8 ath_rc_setvalid_htrates(struct ath_rate_priv *ath_rc_priv, 
				[ath_rc_priv->valid_phy_ratecnt[phy]] = j;

			ath_rc_priv->valid_phy_ratecnt[phy] += 1;

			ath_rc_set_valid_rate_idx(ath_rc_priv, j, 1);

			hi = A_MAX(hi, j);

			hi = max(hi, j);

		}

	}
@@ -1228,7 +1228,7 @@ static void ath_rc_init(struct ath_softc *sc, 
						       ht_mcs,

						       ath_rc_priv->ht_cap);

		}

		hi = A_MAX(hi, hthi);

		hi = max(hi, hthi);

	}



	ath_rc_priv->rate_table_size = hi + 1;