lkml.org 
[lkml]   [2022]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] ath9k: initialize arrays at compile time
    Date
    From: Tom Rix <trix@redhat.com>

    Early clearing of arrays with
    memset(array, 0, size);
    is equivilent to initializing the array in its decl with
    array[size] = { 0 };

    Since compile time is preferred over runtime,
    convert the memsets to initializations.

    Signed-off-by: Tom Rix <trix@redhat.com>
    ---
    drivers/net/wireless/ath/ath9k/ar9003_calib.c | 6 ++----
    drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 4 +---
    drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 14 ++++++--------
    drivers/net/wireless/ath/ath9k/eeprom.c | 3 +--
    drivers/net/wireless/ath/ath9k/eeprom_4k.c | 4 +---
    drivers/net/wireless/ath/ath9k/eeprom_9287.c | 4 +---
    drivers/net/wireless/ath/ath9k/eeprom_def.c | 4 +---
    drivers/net/wireless/ath/ath9k/wow.c | 7 ++-----
    8 files changed, 15 insertions(+), 31 deletions(-)

    diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
    index dc24da1ff00b1..39fcc158cb159 100644
    --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
    +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
    @@ -891,10 +891,9 @@ static void ar9003_hw_tx_iq_cal_outlier_detection(struct ath_hw *ah,
    {
    int i, im, nmeasurement;
    int magnitude, phase;
    - u32 tx_corr_coeff[MAX_MEASUREMENT][AR9300_MAX_CHAINS];
    + u32 tx_corr_coeff[MAX_MEASUREMENT][AR9300_MAX_CHAINS] = { 0 };
    struct ath9k_hw_cal_data *caldata = ah->caldata;

    - memset(tx_corr_coeff, 0, sizeof(tx_corr_coeff));
    for (i = 0; i < MAX_MEASUREMENT / 2; i++) {
    tx_corr_coeff[i * 2][0] = tx_corr_coeff[(i * 2) + 1][0] =
    AR_PHY_TX_IQCAL_CORR_COEFF_B0(i);
    @@ -1155,10 +1154,9 @@ static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah,
    static void ar9003_hw_tx_iq_cal_reload(struct ath_hw *ah)
    {
    struct ath9k_hw_cal_data *caldata = ah->caldata;
    - u32 tx_corr_coeff[MAX_MEASUREMENT][AR9300_MAX_CHAINS];
    + u32 tx_corr_coeff[MAX_MEASUREMENT][AR9300_MAX_CHAINS] = { 0 };
    int i, im;

    - memset(tx_corr_coeff, 0, sizeof(tx_corr_coeff));
    for (i = 0; i < MAX_MEASUREMENT / 2; i++) {
    tx_corr_coeff[i * 2][0] = tx_corr_coeff[(i * 2) + 1][0] =
    AR_PHY_TX_IQCAL_CORR_COEFF_B0(i);
    diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
    index b0a4ca3559fd8..55fdee5ec93be 100644
    --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
    +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
    @@ -5451,14 +5451,12 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah,
    struct ath_common *common = ath9k_hw_common(ah);
    struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
    struct ar9300_modal_eep_header *modal_hdr;
    - u8 targetPowerValT2[ar9300RateSize];
    + u8 targetPowerValT2[ar9300RateSize] = { 0 };
    u8 target_power_val_t2_eep[ar9300RateSize];
    u8 targetPowerValT2_tpc[ar9300RateSize];
    unsigned int i = 0, paprd_scale_factor = 0;
    u8 pwr_idx, min_pwridx = 0;

    - memset(targetPowerValT2, 0 , sizeof(targetPowerValT2));
    -
    /*
    * Get target powers from EEPROM - our baseline for TX Power
    */
    diff --git a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
    index 34e1009402846..d9c5b6bb5db07 100644
    --- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
    +++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
    @@ -419,13 +419,16 @@ static inline int find_proper_scale(int expn, int N)
    static bool create_pa_curve(u32 *data_L, u32 *data_U, u32 *pa_table, u16 *gain)
    {
    unsigned int thresh_accum_cnt;
    - int x_est[NUM_BIN + 1], Y[NUM_BIN + 1], theta[NUM_BIN + 1];
    + int x_est[NUM_BIN + 1] = { 0 };
    + int Y[NUM_BIN + 1] = { 0 };
    + int theta[NUM_BIN + 1] = { 0 };
    int PA_in[NUM_BIN + 1];
    int B1_tmp[NUM_BIN + 1], B2_tmp[NUM_BIN + 1];
    unsigned int B1_abs_max, B2_abs_max;
    int max_index, scale_factor;
    - int y_est[NUM_BIN + 1];
    - int x_est_fxp1_nonlin, x_tilde[NUM_BIN + 1];
    + int y_est[NUM_BIN + 1] = { 0 };
    + int x_est_fxp1_nonlin;
    + int x_tilde[NUM_BIN + 1] = { 0 };
    unsigned int x_tilde_abs;
    int G_fxp, Y_intercept, order_x_by_y, M, I, L, sum_y_sqr, sum_y_quad;
    int Q_x, Q_B1, Q_B2, beta_raw, alpha_raw, scale_B;
    @@ -439,11 +442,6 @@ static bool create_pa_curve(u32 *data_L, u32 *data_U, u32 *pa_table, u16 *gain)
    thresh_accum_cnt = 16;
    scale_factor = 5;
    max_index = 0;
    - memset(theta, 0, sizeof(theta));
    - memset(x_est, 0, sizeof(x_est));
    - memset(Y, 0, sizeof(Y));
    - memset(y_est, 0, sizeof(y_est));
    - memset(x_tilde, 0, sizeof(x_tilde));

    for (i = 0; i < NUM_BIN; i++) {
    s32 accum_cnt, accum_tx, accum_rx, accum_ang;
    diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c
    index efb7889142d47..061d33921495c 100644
    --- a/drivers/net/wireless/ath/ath9k/eeprom.c
    +++ b/drivers/net/wireless/ath/ath9k/eeprom.c
    @@ -480,7 +480,7 @@ void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah,
    [AR5416_MAX_PWR_RANGE_IN_HALF_DB];

    u8 *pVpdL, *pVpdR, *pPwrL, *pPwrR;
    - u8 minPwrT4[AR5416_NUM_PD_GAINS];
    + u8 minPwrT4[AR5416_NUM_PD_GAINS] = { 0 };
    u8 maxPwrT4[AR5416_NUM_PD_GAINS];
    int16_t vpdStep;
    int16_t tmpVal;
    @@ -500,7 +500,6 @@ void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah,
    else
    intercepts = AR5416_PD_GAIN_ICEPTS;

    - memset(&minPwrT4, 0, AR5416_NUM_PD_GAINS);
    ath9k_hw_get_channel_centers(ah, chan, &centers);

    for (numPiers = 0; numPiers < availPiers; numPiers++) {
    diff --git a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
    index e8c2cc03be0cb..1d295d7fa0848 100644
    --- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
    +++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
    @@ -583,12 +583,10 @@ static void ath9k_hw_4k_set_txpower(struct ath_hw *ah,
    struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
    struct ar5416_eeprom_4k *pEepData = &ah->eeprom.map4k;
    struct modal_eep_4k_header *pModal = &pEepData->modalHeader;
    - int16_t ratesArray[Ar5416RateSize];
    + int16_t ratesArray[Ar5416RateSize] = { 0 };
    u8 ht40PowerIncForPdadc = 2;
    int i;

    - memset(ratesArray, 0, sizeof(ratesArray));
    -
    if (ath9k_hw_4k_get_eeprom_rev(ah) >= AR5416_EEP_MINOR_VER_2)
    ht40PowerIncForPdadc = pModal->ht40PowerIncForPdadc;

    diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
    index 3caa149b10131..b068e15226022 100644
    --- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
    +++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
    @@ -711,12 +711,10 @@ static void ath9k_hw_ar9287_set_txpower(struct ath_hw *ah,
    struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
    struct ar9287_eeprom *pEepData = &ah->eeprom.map9287;
    struct modal_eep_ar9287_header *pModal = &pEepData->modalHeader;
    - int16_t ratesArray[Ar5416RateSize];
    + int16_t ratesArray[Ar5416RateSize] = { 0 };
    u8 ht40PowerIncForPdadc = 2;
    int i;

    - memset(ratesArray, 0, sizeof(ratesArray));
    -
    if (ath9k_hw_ar9287_get_eeprom_rev(ah) >= AR9287_EEP_MINOR_VER_2)
    ht40PowerIncForPdadc = pModal->ht40PowerIncForPdadc;

    diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
    index 9729a69d3e2e3..b5ee261c86382 100644
    --- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
    +++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
    @@ -1150,12 +1150,10 @@ static void ath9k_hw_def_set_txpower(struct ath_hw *ah,
    struct ar5416_eeprom_def *pEepData = &ah->eeprom.def;
    struct modal_eep_header *pModal =
    &(pEepData->modalHeader[IS_CHAN_2GHZ(chan)]);
    - int16_t ratesArray[Ar5416RateSize];
    + int16_t ratesArray[Ar5416RateSize] = { 0 };
    u8 ht40PowerIncForPdadc = 2;
    int i, cck_ofdm_delta = 0;

    - memset(ratesArray, 0, sizeof(ratesArray));
    -
    if (ath9k_hw_def_get_eeprom_rev(ah) >= AR5416_EEP_MINOR_VER_2)
    ht40PowerIncForPdadc = pModal->ht40PowerIncForPdadc;

    diff --git a/drivers/net/wireless/ath/ath9k/wow.c b/drivers/net/wireless/ath/ath9k/wow.c
    index 8d0b1730a9d5b..3d39c7ec1da30 100644
    --- a/drivers/net/wireless/ath/ath9k/wow.c
    +++ b/drivers/net/wireless/ath/ath9k/wow.c
    @@ -53,11 +53,8 @@ static int ath9k_wow_add_disassoc_deauth_pattern(struct ath_softc *sc)
    struct ath_common *common = ath9k_hw_common(ah);
    int pattern_count = 0;
    int ret, i, byte_cnt = 0;
    - u8 dis_deauth_pattern[MAX_PATTERN_SIZE];
    - u8 dis_deauth_mask[MAX_PATTERN_SIZE];
    -
    - memset(dis_deauth_pattern, 0, MAX_PATTERN_SIZE);
    - memset(dis_deauth_mask, 0, MAX_PATTERN_SIZE);
    + u8 dis_deauth_pattern[MAX_PATTERN_SIZE] = { 0 };
    + u8 dis_deauth_mask[MAX_PATTERN_SIZE] = { 0 };

    /*
    * Create Dissassociate / Deauthenticate packet filter
    --
    2.26.3
    \
     
     \ /
      Last update: 2022-03-20 16:23    [W:8.802 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site