lkml.org 
[lkml]   [2016]   [Jan]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 2/2] net-ath9k_htc: Replace a variable initialisation by an assignment in ath9k_htc_set_channel()
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Fri, 1 Jan 2016 19:09:32 +0100

    Replace an explicit initialisation for one local variable at the beginning
    by a conditional assignment.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/net/wireless/ath/ath9k/htc_drv_main.c | 7 ++-----
    1 file changed, 2 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
    index a680a97..30bd59e 100644
    --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
    +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
    @@ -246,7 +246,7 @@ static int ath9k_htc_set_channel(struct ath9k_htc_priv *priv,
    struct ieee80211_conf *conf = &common->hw->conf;
    bool fastcc;
    struct ieee80211_channel *channel = hw->conf.chandef.chan;
    - struct ath9k_hw_cal_data *caldata = NULL;
    + struct ath9k_hw_cal_data *caldata;
    enum htc_phymode mode;
    __be16 htc_mode;
    u8 cmd_rsp;
    @@ -274,10 +274,7 @@ static int ath9k_htc_set_channel(struct ath9k_htc_priv *priv,
    priv->ah->curchan->channel,
    channel->center_freq, conf_is_ht(conf), conf_is_ht40(conf),
    fastcc);
    -
    - if (!fastcc)
    - caldata = &priv->caldata;
    -
    + caldata = fastcc ? NULL : &priv->caldata;
    ret = ath9k_hw_reset(ah, hchan, caldata, fastcc);
    if (ret) {
    ath_err(common,
    --
    2.6.3


    \
     
     \ /
      Last update: 2016-01-01 19:41    [W:4.027 / U:0.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site