From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Wed, 5 Jun 2013 14:08:07 +0000 (+0200)
Subject: s390/pci: sysfs remove strlen
X-Git-Tag: next-20130617~103^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3ff94c00fbd273b91e9ffdae65815312f7eebb38;p=karo-tx-linux.git

s390/pci: sysfs remove strlen

Get rid of the strlen calls, use the return value of sprintf instead.

Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/pci/pci_sysfs.c b/arch/s390/pci/pci_sysfs.c
index f9bad5aa5922..e99a2557f186 100644
--- a/arch/s390/pci/pci_sysfs.c
+++ b/arch/s390/pci/pci_sysfs.c
@@ -17,8 +17,7 @@ static ssize_t show_fid(struct device *dev, struct device_attribute *attr,
 {
 	struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));
 
-	sprintf(buf, "0x%08x\n", zdev->fid);
-	return strlen(buf);
+	return sprintf(buf, "0x%08x\n", zdev->fid);
 }
 static DEVICE_ATTR(function_id, S_IRUGO, show_fid, NULL);
 
@@ -27,8 +26,7 @@ static ssize_t show_fh(struct device *dev, struct device_attribute *attr,
 {
 	struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));
 
-	sprintf(buf, "0x%08x\n", zdev->fh);
-	return strlen(buf);
+	return sprintf(buf, "0x%08x\n", zdev->fh);
 }
 static DEVICE_ATTR(function_handle, S_IRUGO, show_fh, NULL);
 
@@ -37,8 +35,7 @@ static ssize_t show_pchid(struct device *dev, struct device_attribute *attr,
 {
 	struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));
 
-	sprintf(buf, "0x%04x\n", zdev->pchid);
-	return strlen(buf);
+	return sprintf(buf, "0x%04x\n", zdev->pchid);
 }
 static DEVICE_ATTR(pchid, S_IRUGO, show_pchid, NULL);
 
@@ -47,8 +44,7 @@ static ssize_t show_pfgid(struct device *dev, struct device_attribute *attr,
 {
 	struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));
 
-	sprintf(buf, "0x%02x\n", zdev->pfgid);
-	return strlen(buf);
+	return sprintf(buf, "0x%02x\n", zdev->pfgid);
 }
 static DEVICE_ATTR(pfgid, S_IRUGO, show_pfgid, NULL);