Commit 22d5aa3a authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Martin K. Petersen
Browse files

scsi: fdomain_isa: use CFG1_IRQ_MASK 



Commit 1697c6a6 ("scsi: fdomain: Add register definitions") somehow
missed the uses of CFG1_IRQ_MASK in the Futire Domain ISA driver, leaving
the magic numbers intact.  Fix this issue (with no change in the generated
object file), removing an excess empty line, while at it...

Fixes: 1697c6a6 ("scsi: fdomain: Add register definitions")
Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 7a1c0b79

drivers/scsi/fdomain_isa.c

+2 −3
Original line number Diff line number Diff line
@@ -131,8 +131,7 @@ static int fdomain_isa_match(struct device *dev, unsigned int ndev) 
	if (!request_region(base, FDOMAIN_REGION_SIZE, "fdomain_isa"))

		return 0;



	irq = irqs[(inb(base + REG_CFG1) & 0x0e) >> 1];



	irq = irqs[(inb(base + REG_CFG1) & CFG1_IRQ_MASK) >> 1];



	if (sig)

		this_id = sig->this_id;
@@ -164,7 +163,7 @@ static int fdomain_isa_param_match(struct device *dev, unsigned int ndev) 
	}



	if (irq_ <= 0)

		irq_ = irqs[(inb(io[ndev] + REG_CFG1) & 0x0e) >> 1];

		irq_ = irqs[(inb(io[ndev] + REG_CFG1) & CFG1_IRQ_MASK) >> 1];



	sh = fdomain_create(io[ndev], irq_, scsi_id[ndev], dev);

	if (!sh) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE