s390: remove use of seq_printf return value

The seq_printf return value, because it's frequently misused,
will eventually be converted to void.

See: commit 1f33c41c03da ("seq_file: Rename seq_overflow() to
     seq_has_overflowed() and make public")

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/s390/pci/pci_debug.c b/arch/s390/pci/pci_debug.c
index 3229a2e570df2215801c49c9c3e734cd72c503b6..c22d4402ae45cde3f18878600bb9fdd50d1d0a1c 100644 (file)
--- a/arch/s390/pci/pci_debug.c
+++ b/arch/s390/pci/pci_debug.c
@@ -45,8 +45,10 @@ static int pci_perf_show(struct seq_file *m, void *v)
 
        if (!zdev)
                return 0;
-       if (!zdev->fmb)
-               return seq_printf(m, "FMB statistics disabled\n");
+       if (!zdev->fmb) {
+               seq_puts(m, "FMB statistics disabled\n");
+               return 0;
+       }
 
        /* header */
        seq_printf(m, "FMB @ %p\n", zdev->fmb);

diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index b3f791b2c1f8994de2287052275fc8853b3b946a..20314aad7ab7d1c30eaadedd143a66e95b363bb6 100644 (file)
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -330,18 +330,20 @@ cio_ignore_proc_seq_show(struct seq_file *s, void *it)
        if (!iter->in_range) {
                /* First device in range. */
                if ((iter->devno == __MAX_SUBCHANNEL) ||
-                   !is_blacklisted(iter->ssid, iter->devno + 1))
+                   !is_blacklisted(iter->ssid, iter->devno + 1)) {
                        /* Singular device. */
-                       return seq_printf(s, "0.%x.%04x\n",
-                                         iter->ssid, iter->devno);
+                       seq_printf(s, "0.%x.%04x\n", iter->ssid, iter->devno);
+                       return 0;
+               }
                iter->in_range = 1;
-               return seq_printf(s, "0.%x.%04x-", iter->ssid, iter->devno);
+               seq_printf(s, "0.%x.%04x-", iter->ssid, iter->devno);
+               return 0;
        }
        if ((iter->devno == __MAX_SUBCHANNEL) ||
            !is_blacklisted(iter->ssid, iter->devno + 1)) {
                /* Last device in range. */
                iter->in_range = 0;
-               return seq_printf(s, "0.%x.%04x\n", iter->ssid, iter->devno);
+               seq_printf(s, "0.%x.%04x\n", iter->ssid, iter->devno);
        }
        return 0;
 }