On Sun, Oct 04, 2015 at 06:55:57PM -0400, Raphaël Beamonte wrote:
> Add some temporary variables to reduce line length under the maximum
> of 80 characters, as per the kernel code style.
>
> Signed-off-by: Raphaël Beamonte <raphael.beamonte@xxxxxxxxx>
> ---
> drivers/staging/rtl8192u/r8192U_core.c | 130 ++++++++++++++++++++++-----------
> 1 file changed, 88 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
> index 28b54ba..e67be02 100644
> --- a/drivers/staging/rtl8192u/r8192U_core.c
> +++ b/drivers/staging/rtl8192u/r8192U_core.c
> @@ -171,6 +171,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv)
> {
> int i, max_chan = -1, min_chan = -1;
> struct ieee80211_device *ieee = priv->ieee80211;
> + struct CHANNEL_LIST *cl;
>
> switch (channel_plan) {
> case COUNTRY_CODE_FCC:
> @@ -194,15 +195,18 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv)
> "unknown rf chip, can't set channel map in function:%s()\n",
> __func__);
> }
> - if (ChannelPlan[channel_plan].Len != 0) {
> + cl = &ChannelPlan[channel_plan];
> + if (cl->Len != 0) {
> /* Clear old channel map */
> memset(GET_DOT11D_INFO(ieee)->channel_map, 0,
> sizeof(GET_DOT11D_INFO(ieee)->channel_map));
> /* Set new channel map */
> - for (i = 0; i < ChannelPlan[channel_plan].Len; i++) {
> - if (ChannelPlan[channel_plan].Channel[i] < min_chan || ChannelPlan[channel_plan].Channel[i] > max_chan)
> + for (i = 0; i < cl->Len; i++) {
> + u8 chan = cl->Channel[i];
> +
> + if (chan < min_chan || chan > max_chan)
> break;
> - GET_DOT11D_INFO(ieee)->channel_map[ChannelPlan[channel_plan].Channel[i]] = 1;
> + GET_DOT11D_INFO(ieee)->channel_map[chan] = 1;
> }
> }
> break;
> @@ -1649,9 +1653,11 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
> &zero, 0, tx_zero_isr, dev);
> status = usb_submit_urb(tx_urb_zero, GFP_ATOMIC);
> if (status) {
> + int idx = tcb_desc->queue_index;
> +
> RT_TRACE(COMP_ERR,
> "Error TX URB for zero byte %d, error %d",
> - atomic_read(&priv->tx_pending[tcb_desc->queue_index]),
> + atomic_read(&priv->tx_pending[idx]),
No need to create a whole new variable when you only use it once.
> status);
> return -1;
> }
> @@ -1863,7 +1869,9 @@ static void rtl8192_qos_activate(struct work_struct *work)
> */
> for (i = 0; i < QOS_QUEUE_NUM; i++) {
> /* Mode G/A: slotTimeTimer = 9; Mode B: 20 */
> - u1bAIFS = qos_parameters->aifs[i] * ((mode & (IEEE_G | IEEE_N_24G)) ? 9 : 20) + aSifsTime;
> + int slotTimeTimer = ((mode & (IEEE_G | IEEE_N_24G)) ? 9 : 20);
> +
> + u1bAIFS = qos_parameters->aifs[i] * slotTimeTimer + aSifsTime;
Same here, you only used this once, if you just don't like the
formatting, change that, but don't create a variable that is only used
once please.
thanks,
greg k-h
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
