Re: [PATCH v1 3/3] staging: rtl8192e: fix line over 80 characters warning

[Greg KH <gregkh@linuxfoundation.org>]

On Mon, Mar 11, 2019 at 12:07:02AM +0000, Jules Irenge wrote:
> Replace dot11d_info with dt1d_inf to fix checkpatch.pl warning
>  Issue found by checkpatch.pl:
>  "WARNING: line over 80 characters"
> 
> Signed-off-by: Jules Irenge <jbi.octave@gmail.com>
> ---
>  drivers/staging/rtl8192e/dot11d.c | 48 +++++++++++++++----------------
>  1 file changed, 24 insertions(+), 24 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192e/dot11d.c b/drivers/staging/rtl8192e/dot11d.c
> index 721892cef3a7..17738859b197 100644
> --- a/drivers/staging/rtl8192e/dot11d.c
> +++ b/drivers/staging/rtl8192e/dot11d.c
> @@ -37,14 +37,14 @@ static struct channel_list channel_array[] = {
>  
>  void dot11d_init(struct rtllib_device *ieee)
>  {
> -	struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(ieee);
> +	struct rt_dot11d_info *dt1d_inf = GET_DOT11D_INFO(ieee);

No, the original variable name is fine, don't shorten things for no good
reason.

>  
> -	dot11d_info->enabled = false;
> +	dt1d_inf->enabled = false;
>  
> -	dot11d_info->state = DOT11D_STATE_NONE;
> -	dot11d_info->country_len = 0;
> -	memset(dot11d_info->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
> -	memset(dot11d_info->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
> +	dt1d_inf->state = DOT11D_STATE_NONE;
> +	dt1d_inf->country_len = 0;
> +	memset(dt1d_inf->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
> +	memset(dt1d_inf->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
>  	RESET_CIE_WATCHDOG(ieee);
>  }
>  EXPORT_SYMBOL(dot11d_init);

None of those lines were over 80 characters, so why did you change
anything here?

> @@ -93,29 +93,29 @@ EXPORT_SYMBOL(dot11d_channel_map);
>  
>  void dot11d_reset(struct rtllib_device *ieee)
>  {
> -	struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(ieee);
> +	struct rt_dot11d_info *dt1d_inf = GET_DOT11D_INFO(ieee);
>  	u32 i;
>  
> -	memset(dot11d_info->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
> -	memset(dot11d_info->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
> +	memset(dt1d_inf->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
> +	memset(dt1d_inf->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
>  	for (i = 1; i <= 11; i++)
> -		(dot11d_info->channel_map)[i] = 1;
> +		(dt1d_inf->channel_map)[i] = 1;
>  	for (i = 12; i <= 14; i++)
> -		(dot11d_info->channel_map)[i] = 2;
> -	dot11d_info->state = DOT11D_STATE_NONE;
> -	dot11d_info->country_len = 0;
> +		(dt1d_inf->channel_map)[i] = 2;
> +	dt1d_inf->state = DOT11D_STATE_NONE;
> +	dt1d_inf->country_len = 0;
>  	RESET_CIE_WATCHDOG(ieee);
>  }

Same with this function, what is wrong with it as-is?

>  
>  void dot11d_update_country(struct rtllib_device *dev, u8 *address,
>  			   u16 country_len, u8 *country)
>  {
> -	struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(dev);
> +	struct rt_dot11d_info *dt1d_inf = GET_DOT11D_INFO(dev);
>  	u8 i, j, number_of_triples, max_channel_number;
>  	struct chnl_txpow_triple *triple;
>  
> -	memset(dot11d_info->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
> -	memset(dot11d_info->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
> +	memset(dt1d_inf->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
> +	memset(dt1d_inf->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
>  	max_channel_number = 0;
>  	number_of_triples = (country_len - 3) / 3;
>  	triple = (struct chnl_txpow_triple *)(country + 3);

Same here.

> @@ -135,8 +135,8 @@ void dot11d_update_country(struct rtllib_device *dev, u8 *address,
>  		}
>  
>  		for (j = 0; j < triple->num_channels; j++) {
> -			dot11d_info->channel_map[triple->first_channel + j] = 1;
> -			dot11d_info->max_tx_power_list[triple->first_channel + j] =
> +			dt1d_inf->channel_map[triple->first_channel + j] = 1;
> +			dt1d_inf->max_tx_power_list[triple->first_channel + j] =
>  						 triple->max_tx_power;
>  			max_channel_number = triple->first_channel + j;
>  		}

Ok, that one line is "too long", but really, it is fine as-is, no need
to change it.

> @@ -146,18 +146,18 @@ void dot11d_update_country(struct rtllib_device *dev, u8 *address,
>  
>  	UPDATE_CIE_SRC(dev, address);
>  
> -	dot11d_info->country_len = country_len;
> -	memcpy(dot11d_info->country_buffer, country, country_len);
> -	dot11d_info->state = DOT11D_STATE_LEARNED;
> +	dt1d_inf->country_len = country_len;
> +	memcpy(dt1d_inf->country_buffer, country, country_len);
> +	dt1d_inf->state = DOT11D_STATE_LEARNED;
>  }
>  
>  void dot11d_scan_complete(struct rtllib_device *dev)
>  {
> -	struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(dev);
> +	struct rt_dot11d_info *dt1d_inf = GET_DOT11D_INFO(dev);
>  
> -	switch (dot11d_info->state) {
> +	switch (dt1d_inf->state) {
>  	case DOT11D_STATE_LEARNED:
> -		dot11d_info->state = DOT11D_STATE_DONE;
> +		dt1d_inf->state = DOT11D_STATE_DONE;
>  		break;
>  	case DOT11D_STATE_DONE:
>  		dot11d_reset(dev);

Why change these lines?

As was said before, checkpatch is a hint, not a hard rule.  You always
need to think when making changes.

thanks,

greg k-h