diff mbox

[1/2] ath10k: dump fw features during probing

Message ID 871thiaxjq.fsf@kamboji.qca.qualcomm.com (mailing list archive)
State Not Applicable
Headers show

Commit Message

Kalle Valo June 11, 2015, 6:51 p.m. UTC 
Michal Kazior <michal.kazior@tieto.com> writes:

> This should help when analysing problems from
> users and spot fw api blob problems easier.
>
> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>

[...]

> +static unsigned int ath10k_core_get_fw_feature_str(char *buf,
> +						   size_t buf_len,
> +						   enum ath10k_fw_features feat)
> +{
> +	if (feat >= ARRAY_SIZE(ath10k_core_fw_feature_str) ||
> +	    WARN_ON(!ath10k_core_fw_feature_str[feat])) {
> +		return scnprintf(buf, buf_len, "bit%d", feat);
> +	} else {
> +		return scnprintf(buf, buf_len, "%s",
> +				 ath10k_core_fw_feature_str[feat]);
> +	}
> +}

I think the else is useless and did the change below in pending branch.
Please review.

Comments

Michal Kazior June 12, 2015, 5:56 a.m. UTC | #1 
On 11 June 2015 at 20:51, Kalle Valo <kvalo@qca.qualcomm.com> wrote:
> Michal Kazior <michal.kazior@tieto.com> writes:
>
>> This should help when analysing problems from
>> users and spot fw api blob problems easier.
>>
>> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
>
> [...]
>
>> +static unsigned int ath10k_core_get_fw_feature_str(char *buf,
>> +                                                size_t buf_len,
>> +                                                enum ath10k_fw_features feat)
>> +{
>> +     if (feat >= ARRAY_SIZE(ath10k_core_fw_feature_str) ||
>> +         WARN_ON(!ath10k_core_fw_feature_str[feat])) {
>> +             return scnprintf(buf, buf_len, "bit%d", feat);
>> +     } else {
>> +             return scnprintf(buf, buf_len, "%s",
>> +                              ath10k_core_fw_feature_str[feat]);
>> +     }
>> +}
>
> I think the else is useless and did the change below in pending branch.
> Please review.
>
> --- a/drivers/net/wireless/ath/ath10k/core.c
> +++ b/drivers/net/wireless/ath/ath10k/core.c
> @@ -123,10 +123,9 @@ static unsigned int ath10k_core_get_fw_feature_str(char *buf,
>         if (feat >= ARRAY_SIZE(ath10k_core_fw_feature_str) ||
>             WARN_ON(!ath10k_core_fw_feature_str[feat])) {
>                 return scnprintf(buf, buf_len, "bit%d", feat);
> -       } else {
> -               return scnprintf(buf, buf_len, "%s",
> -                                ath10k_core_fw_feature_str[feat]);
>         }
> +
> +       return scnprintf(buf, buf_len, "%s", ath10k_core_fw_feature_str[feat]);
>  }
>
>  void ath10k_core_get_fw_features_str(struct ath10k *ar,

I think the "else" approach is a bit more easier on the eyes because
scnprintf() and format strings are aligned against each other.

I understand that you dropped "else" to adhere to `if (error) { handle error }`.

No strong opinions. Feel free to pick whatever suits you.


Micha?
diff mbox

Patch

--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -123,10 +123,9 @@  static unsigned int ath10k_core_get_fw_feature_str(char *buf,
        if (feat >= ARRAY_SIZE(ath10k_core_fw_feature_str) ||
            WARN_ON(!ath10k_core_fw_feature_str[feat])) {
                return scnprintf(buf, buf_len, "bit%d", feat);
-       } else {
-               return scnprintf(buf, buf_len, "%s",
-                                ath10k_core_fw_feature_str[feat]);
        }
+
+       return scnprintf(buf, buf_len, "%s", ath10k_core_fw_feature_str[feat]);
 }
 
 void ath10k_core_get_fw_features_str(struct ath10k *ar,