[PATCH] mei: bus: use scnprintf in *_show

[Rasmus Villemoes]

There's no reason to duplicate the logic provided by scnprintf().

Signed-off-by: Rasmus Villemoes <li...@rasmusvillemoes.dk>
---
 drivers/misc/mei/bus.c | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index 0b05aa938799..630bdf1f8bcb 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -617,11 +617,8 @@ static ssize_t name_show(struct device *dev, struct 
device_attribute *a,
                             char *buf)
 {
        struct mei_cl_device *cldev = to_mei_cl_device(dev);
-       size_t len;
 
-       len = snprintf(buf, PAGE_SIZE, "%s", cldev->name);
-
-       return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
+       return scnprintf(buf, PAGE_SIZE, "%s", cldev->name);
 }
 static DEVICE_ATTR_RO(name);
 
@@ -630,11 +627,8 @@ static ssize_t uuid_show(struct device *dev, struct 
device_attribute *a,
 {
        struct mei_cl_device *cldev = to_mei_cl_device(dev);
        const uuid_le *uuid = mei_me_cl_uuid(cldev->me_cl);
-       size_t len;
-
-       len = snprintf(buf, PAGE_SIZE, "%pUl", uuid);
 
-       return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
+       return scnprintf(buf, PAGE_SIZE, "%pUl", uuid);
 }
 static DEVICE_ATTR_RO(uuid);
 
@@ -643,11 +637,8 @@ static ssize_t version_show(struct device *dev, struct 
device_attribute *a,
 {
        struct mei_cl_device *cldev = to_mei_cl_device(dev);
        u8 version = mei_me_cl_ver(cldev->me_cl);
-       size_t len;
-
-       len = snprintf(buf, PAGE_SIZE, "%02X", version);
 
-       return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
+       return scnprintf(buf, PAGE_SIZE, "%02X", version);
 }
 static DEVICE_ATTR_RO(version);
 
@@ -656,10 +647,8 @@ static ssize_t modalias_show(struct device *dev, struct 
device_attribute *a,
 {
        struct mei_cl_device *cldev = to_mei_cl_device(dev);
        const uuid_le *uuid = mei_me_cl_uuid(cldev->me_cl);
-       size_t len;
 
-       len = snprintf(buf, PAGE_SIZE, "mei:%s:%pUl:", cldev->name, uuid);
-       return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
+       return scnprintf(buf, PAGE_SIZE, "mei:%s:%pUl:", cldev->name, uuid);
 }
 static DEVICE_ATTR_RO(modalias);
 
-- 
2.6.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/