Pull bugzilla-7887 into release branch

[linux-2.6-omap-h63xx.git] / drivers / s390 / cio / device.c

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 78ed65bf2f99091144f3c4f5f28dc90144b6b936..e322111fb3696bb066f0b6758a2491d977422c14 100644 (file)
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -234,11 +234,8 @@ chpids_show (struct device * dev, struct device_attribute *attr, char * buf)
        ssize_t ret = 0;
        int chp;
 
-       if (ssd)
-               for (chp = 0; chp < 8; chp++)
-                       ret += sprintf (buf+ret, "%02x ", ssd->chpid[chp]);
-       else
-               ret += sprintf (buf, "n/a");
+       for (chp = 0; chp < 8; chp++)
+               ret += sprintf (buf+ret, "%02x ", ssd->chpid[chp]);
        ret += sprintf (buf+ret, "\n");
        return min((ssize_t)PAGE_SIZE, ret);
 }
@@ -551,13 +548,13 @@ static struct attribute_group ccwdev_attr_group = {
        .attrs = ccwdev_attrs,
 };
 
-static inline int
+static int
 device_add_files (struct device *dev)
 {
        return sysfs_create_group(&dev->kobj, &ccwdev_attr_group);
 }
 
-static inline void
+static void
 device_remove_files(struct device *dev)
 {
        sysfs_remove_group(&dev->kobj, &ccwdev_attr_group);