| Message ID | 20181203222654.GA155572@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4cb777c64e030778c569f605398d7604d8aabc0f |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v2] mwifiex: debugfs: correct histogram spacing, formatting | expand |
Brian Norris <briannorris@chromium.org> writes: > Here's a v2 that combines both sets of strings in that way. I'm not > resending the other patches, since they were only related in concept > (since I was referring to debugfs for implementing the nl80211 stuff), > but have no real dependency. > > @Kalle: I can resend the others as a new series if that helps. Yeah, it does. Trying to pick patches from different places in patchwork is just too much of a hassle for me. So please do resend the whole series. https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#resubmit_the_whole_patchset
On Tue, Dec 04, 2018 at 08:37:30AM +0200, Kalle Valo wrote: > Brian Norris <briannorris@chromium.org> writes: > > > Here's a v2 that combines both sets of strings in that way. I'm not > > resending the other patches, since they were only related in concept > > (since I was referring to debugfs for implementing the nl80211 stuff), > > but have no real dependency. > > > > @Kalle: I can resend the others as a new series if that helps. > > Yeah, it does. Trying to pick patches from different places in patchwork > is just too much of a hassle for me. So please do resend the whole > series. I've split them up and resent the other 2 unmodified now (as 'RFC PATCH v2 X/2'), as this patch is trivial and not related to the others directly. They can be applied in any order. Hopefully that's sufficient. Brian
Brian Norris <briannorris@chromium.org> wrote: > Currently, snippets of this file look like: > > rx rates (in Mbps): 0=1M 1=2M2=5.5M 3=11M 4=6M 5=9M 6=12M > 7=18M 8=24M 9=36M 10=48M 11=54M12-27=MCS0-15(BW20) 28-43=MCS0-15(BW40) > 44-53=MCS0-9(VHT:BW20)54-63=MCS0-9(VHT:BW40)64-73=MCS0-9(VHT:BW80) > ... > noise_flr[--96dBm] = 22 > noise_flr[--95dBm] = 149 > noise_flr[--94dBm] = 9 > noise_flr[--93dBm] = 2 > > We're missing some spaces, and we're adding a minus sign ('-') on values > that are already negative signed integers. > > Signed-off-by: Brian Norris <briannorris@chromium.org> Patch applied to wireless-drivers-next.git, thanks. 4cb777c64e03 mwifiex: debugfs: correct histogram spacing, formatting
diff --git a/drivers/net/wireless/marvell/mwifiex/debugfs.c b/drivers/net/wireless/marvell/mwifiex/debugfs.c index cce70252fd96..cbe4493b3266 100644 --- a/drivers/net/wireless/marvell/mwifiex/debugfs.c +++ b/drivers/net/wireless/marvell/mwifiex/debugfs.c @@ -273,15 +273,13 @@ mwifiex_histogram_read(struct file *file, char __user *ubuf, "total samples = %d\n", atomic_read(&phist_data->num_samples)); - p += sprintf(p, "rx rates (in Mbps): 0=1M 1=2M"); - p += sprintf(p, "2=5.5M 3=11M 4=6M 5=9M 6=12M\n"); - p += sprintf(p, "7=18M 8=24M 9=36M 10=48M 11=54M"); - p += sprintf(p, "12-27=MCS0-15(BW20) 28-43=MCS0-15(BW40)\n"); + p += sprintf(p, + "rx rates (in Mbps): 0=1M 1=2M 2=5.5M 3=11M 4=6M 5=9M 6=12M\n" + "7=18M 8=24M 9=36M 10=48M 11=54M 12-27=MCS0-15(BW20) 28-43=MCS0-15(BW40)\n"); if (ISSUPP_11ACENABLED(priv->adapter->fw_cap_info)) { - p += sprintf(p, "44-53=MCS0-9(VHT:BW20)"); - p += sprintf(p, "54-63=MCS0-9(VHT:BW40)"); - p += sprintf(p, "64-73=MCS0-9(VHT:BW80)\n\n"); + p += sprintf(p, + "44-53=MCS0-9(VHT:BW20) 54-63=MCS0-9(VHT:BW40) 64-73=MCS0-9(VHT:BW80)\n\n"); } else { p += sprintf(p, "\n"); } @@ -310,7 +308,7 @@ mwifiex_histogram_read(struct file *file, char __user *ubuf, for (i = 0; i < MWIFIEX_MAX_NOISE_FLR; i++) { value = atomic_read(&phist_data->noise_flr[i]); if (value) - p += sprintf(p, "noise_flr[-%02ddBm] = %d\n", + p += sprintf(p, "noise_flr[%02ddBm] = %d\n", (int)(i-128), value); } for (i = 0; i < MWIFIEX_MAX_SIG_STRENGTH; i++) {
Currently, snippets of this file look like: rx rates (in Mbps): 0=1M 1=2M2=5.5M 3=11M 4=6M 5=9M 6=12M 7=18M 8=24M 9=36M 10=48M 11=54M12-27=MCS0-15(BW20) 28-43=MCS0-15(BW40) 44-53=MCS0-9(VHT:BW20)54-63=MCS0-9(VHT:BW40)64-73=MCS0-9(VHT:BW80) ... noise_flr[--96dBm] = 22 noise_flr[--95dBm] = 149 noise_flr[--94dBm] = 9 noise_flr[--93dBm] = 2 We're missing some spaces, and we're adding a minus sign ('-') on values that are already negative signed integers. Signed-off-by: Brian Norris <briannorris@chromium.org> --- v2: * combine strings to improve readability and save a tiny bit of code On Mon, Dec 03, 2018 at 10:32:52AM -0800, Joe Perches wrote: > It's be smaller object code and more intelligible source to use > a single coalesced string with one sprintf Sure, I can do that. Here's a v2 that combines both sets of strings in that way. I'm not resending the other patches, since they were only related in concept (since I was referring to debugfs for implementing the nl80211 stuff), but have no real dependency. @Kalle: I can resend the others as a new series if that helps. drivers/net/wireless/marvell/mwifiex/debugfs.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)