2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index ec18bae05df0..6d4959807abc 100644
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -1178,9 +1178,9 @@ qeth_ipaddr_to_string(enum qeth_prot_versions proto, const __u8 *addr,
                       char *buf)
 {
         if (proto == QETH_PROT_IPV4)
-                return qeth_ipaddr4_to_string(addr, buf);
+                qeth_ipaddr4_to_string(addr, buf);
         else if (proto == QETH_PROT_IPV6)
-                return qeth_ipaddr6_to_string(addr, buf);
+                qeth_ipaddr6_to_string(addr, buf);
 }
 
 static inline int
diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c
index bb0287ad1aac..2cc3f3a0e393 100644
--- a/drivers/s390/net/qeth_sys.c
+++ b/drivers/s390/net/qeth_sys.c
@@ -1760,10 +1760,10 @@ qeth_remove_device_attributes(struct device *dev)
 {
         struct qeth_card *card = dev->driver_data;
 
-        if (card->info.type == QETH_CARD_TYPE_OSN)
-                return sysfs_remove_group(&dev->kobj,
-                                          &qeth_osn_device_attr_group);
-
+        if (card->info.type == QETH_CARD_TYPE_OSN) {
+                sysfs_remove_group(&dev->kobj, &qeth_osn_device_attr_group);
+                return;
+        }
         sysfs_remove_group(&dev->kobj, &qeth_device_attr_group);
         sysfs_remove_group(&dev->kobj, &qeth_device_ipato_group);
         sysfs_remove_group(&dev->kobj, &qeth_device_vipa_group);