s390/pci: sysfs remove strlen

[cascardo/linux.git] / arch / s390 / pci / pci_sysfs.c

diff --git a/arch/s390/pci/pci_sysfs.c b/arch/s390/pci/pci_sysfs.c
index a42cce6..e99a255 100644 (file)
--- a/arch/s390/pci/pci_sysfs.c
+++ b/arch/s390/pci/pci_sysfs.c
@@ -15,40 +15,36 @@
 static ssize_t show_fid(struct device *dev, struct device_attribute *attr,
                        char *buf)
 {
-       struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));
+       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);
 
 static ssize_t show_fh(struct device *dev, struct device_attribute *attr,
                       char *buf)
 {
-       struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));
+       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);
 
 static ssize_t show_pchid(struct device *dev, struct device_attribute *attr,
                          char *buf)
 {
-       struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));
+       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);
 
 static ssize_t show_pfgid(struct device *dev, struct device_attribute *attr,
                          char *buf)
 {
-       struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));
+       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);