Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2f0b61d authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

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 1f33c41c ("seq_file: Rename seq_overflow() to
     seq_has_overflowed() and make public")

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarSebastian 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dc640a88

arch/s390/pci/pci_debug.c

+4 −2
Original line number Diff line number Diff line
@@ -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);

drivers/s390/cio/blacklist.c

+7 −5
Original line number Diff line number Diff line
@@ -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;

}