The patch titled Subject: staging: wlan-ng: use %*pEhp to print SN has been added to the -mm tree. Its filename is staging-wlan-ng-use-%pehp-to-print-sn.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/staging-wlan-ng-use-%pehp-to-print-sn.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/staging-wlan-ng-use-%pehp-to-print-sn.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> Subject: staging: wlan-ng: use %*pEhp to print SN This is a generic specifier to print an escaped buffer by given criteria. Let's use it instead of custom approach. Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> Cc: "John W . Linville" <linville@xxxxxxxxxxxxx> Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Joe Perches <joe@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/staging/wlan-ng/prism2sta.c | 28 +------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff -puN drivers/staging/wlan-ng/prism2sta.c~staging-wlan-ng-use-%pehp-to-print-sn drivers/staging/wlan-ng/prism2sta.c --- a/drivers/staging/wlan-ng/prism2sta.c~staging-wlan-ng-use-%pehp-to-print-sn +++ a/drivers/staging/wlan-ng/prism2sta.c @@ -60,7 +60,6 @@ #include <linux/netdevice.h> #include <linux/workqueue.h> #include <linux/byteorder/generic.h> -#include <linux/ctype.h> #include <linux/io.h> #include <linux/delay.h> @@ -81,27 +80,6 @@ #include "hfa384x.h" #include "prism2mgmt.h" -/* Create a string of printable chars from something that might not be */ -/* It's recommended that the str be 4*len + 1 bytes long */ -#define wlan_mkprintstr(buf, buflen, str, strlen) \ -{ \ - int i = 0; \ - int j = 0; \ - memset(str, 0, (strlen)); \ - for (i = 0; i < (buflen); i++) { \ - if (isprint((buf)[i])) { \ - (str)[j] = (buf)[i]; \ - j++; \ - } else { \ - (str)[j] = '\\'; \ - (str)[j+1] = 'x'; \ - (str)[j+2] = hex_asc_hi((buf)[i]); \ - (str)[j+3] = hex_asc_lo((buf)[i]); \ - j += 4; \ - } \ - } \ -} - static char *dev_info = "prism2_usb"; static wlandevice_t *create_wlan(void); @@ -607,7 +585,6 @@ static int prism2sta_getcardinfo(wlandev hfa384x_t *hw = (hfa384x_t *) wlandev->priv; u16 temp; u8 snum[HFA384x_RID_NICSERIALNUMBER_LEN]; - char pstr[(HFA384x_RID_NICSERIALNUMBER_LEN * 4) + 1]; /* Collect version and compatibility info */ /* Some are critical, some are not */ @@ -862,9 +839,8 @@ static int prism2sta_getcardinfo(wlandev result = hfa384x_drvr_getconfig(hw, HFA384x_RID_NICSERIALNUMBER, snum, HFA384x_RID_NICSERIALNUMBER_LEN); if (!result) { - wlan_mkprintstr(snum, HFA384x_RID_NICSERIALNUMBER_LEN, - pstr, sizeof(pstr)); - netdev_info(wlandev->netdev, "Prism2 card SN: %s\n", pstr); + netdev_info(wlandev->netdev, "Prism2 card SN: %*pEhp\n", + HFA384x_RID_NICSERIALNUMBER_LEN, snum); } else { netdev_err(wlandev->netdev, "Failed to retrieve Prism2 Card SN\n"); goto failed; _ Patches currently in -mm which might be from andriy.shevchenko@xxxxxxxxxxxxxxx are lib-string_helpers-move-documentation-to-c-file.patch lib-string_helpers-refactoring-the-test-suite.patch lib-string_helpers-introduce-string_escape_mem.patch lib-vsprintf-add-%pe-format-specifier.patch lib-vsprintf-add-%pe-format-specifier-fix.patch wireless-libertas-print-esaped-string-via-%pe.patch wireless-ipw2x00-print-ssid-via-%pe.patch wireless-hostap-proc-print-properly-escaped-ssid.patch lib80211-remove-unused-print_ssid.patch staging-wlan-ng-use-%pehp-to-print-sn.patch staging-rtl8192e-use-%pen-to-escape-buffer.patch staging-rtl8192u-use-%pen-to-escape-buffer.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html