Commit 255937d7 authored Aug 29, 2020 by Sergey Shtylyov Committed by Martin K. Petersen Sep 02, 2020

scsi: fdomain_isa: Merge branches in fdomain_isa_match()

The *else* branch of the *if* (base) statement in fdomain_isa_match() is
immediately followed by the *if* (!base) statement. Simplify the code by
removing the unneeded *if*.

Link: https://lore.kernel.org/r/df68e341-5113-4cf2-b64c-dc1ad0b686ac@omprussia.ru

Signed-off-by: Sergey Shtylyov <s.shtylyov@omprussia.ru>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent e5f48ac4

drivers/scsi/fdomain_isa.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -111,12 +111,11 @@ static int fdomain_isa_match(struct device *dev, unsigned int ndev)
		base = readb(p + sig->base_offset) +
		(readb(p + sig->base_offset + 1) << 8);
		iounmap(p);
		if (base)
		if (base) {
		dev_info(dev, "BIOS at 0x%lx specifies I/O base 0x%x\n",
		bios_base, base);
		else
		} else { /* no I/O base in BIOS area */
		dev_info(dev, "BIOS at 0x%lx\n", bios_base);
		if (!base) { /* no I/O base in BIOS area */
		/* save BIOS signature for later use in port probing */
		saved_sig = sig;
		return 0;