mfd: wm831x: Fix broken wm831x_unique_id_show
authorRasmus Villemoes <linux@rasmusvillemoes.dk>
Sat, 5 Dec 2015 23:39:39 +0000 (00:39 +0100)
committerLee Jones <lee.jones@linaro.org>
Mon, 11 Jan 2016 06:23:21 +0000 (06:23 +0000)
wm831x_unique_id_show currently displays an interesting pattern of '0'
and '3' characters which isn't very useful (figuring out why is left
as an exercise for the reader). Presumably "buf[i]" should have been
"id[i] & 0xff".

But while there, it is much simpler to simply use %phN and do all the
formatting at once.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/wm831x-otp.c

index b90f3e06b6c957f6a73aa87e0eb9bbec2f38fa58..ebac0027f8e0154b2ea0846aafe0cb2f786d695a 100644 (file)
@@ -47,20 +47,14 @@ static ssize_t wm831x_unique_id_show(struct device *dev,
                                     struct device_attribute *attr, char *buf)
 {
        struct wm831x *wm831x = dev_get_drvdata(dev);
-       int i, rval;
+       int rval;
        char id[WM831X_UNIQUE_ID_LEN];
-       ssize_t ret = 0;
 
        rval = wm831x_unique_id_read(wm831x, id);
        if (rval < 0)
                return 0;
 
-       for (i = 0; i < WM831X_UNIQUE_ID_LEN; i++)
-               ret += sprintf(&buf[ret], "%02x", buf[i]);
-
-       ret += sprintf(&buf[ret], "\n");
-
-       return ret;
+       return sprintf(buf, "%*phN\n", WM831X_UNIQUE_ID_LEN, id);
 }
 
 static DEVICE_ATTR(unique_id, 0444, wm831x_unique_id_show, NULL);