| Message ID | 5686C47E.1040906@users.sourceforge.net (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Kalle Valo |
| Headers | show |
Am 01.01.2016 um 19:25 schrieb SF Markus Elfring: > 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, > Reviewed-by: Oleksij Rempel <linux@rempel-privat.de>
Hi Kalle, On Sat, Jan 2, 2016 at 5:25 AM, SF Markus Elfring <elfring@users.sourceforge.net> wrote: > 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> This looks sane to me. Reviewed-by: Julian Calaby <julian.calaby@gmail.com> Thanks, Julian Calaby > --- > 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 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
Julian Calaby <julian.calaby@gmail.com> writes: > Hi Kalle, > > On Sat, Jan 2, 2016 at 5:25 AM, SF Markus Elfring > <elfring@users.sourceforge.net> wrote: >> 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> > > This looks sane to me. > > Reviewed-by: Julian Calaby <julian.calaby@gmail.com> Before I commit I'll just change the commit title to: ath9k_htc: Replace a variable initialisation by an assignment in ath9k_htc_set_channel()
Hi Kalle, On Fri, Apr 15, 2016 at 10:09 PM, Kalle Valo <kvalo@codeaurora.org> wrote: > Julian Calaby <julian.calaby@gmail.com> writes: > >> Hi Kalle, >> >> On Sat, Jan 2, 2016 at 5:25 AM, SF Markus Elfring >> <elfring@users.sourceforge.net> wrote: >>> 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> >> >> This looks sane to me. >> >> Reviewed-by: Julian Calaby <julian.calaby@gmail.com> > > Before I commit I'll just change the commit title to: > > ath9k_htc: Replace a variable initialisation by an assignment in ath9k_htc_set_channel() Sounds good to me. Thanks,
Julian Calaby <julian.calaby@gmail.com> writes: > On Sat, Jan 2, 2016 at 5:25 AM, SF Markus Elfring > <elfring@users.sourceforge.net> wrote: >> 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> > > This looks sane to me. > > Reviewed-by: Julian Calaby <julian.calaby@gmail.com> Applied, thanks.
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,