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

Commit dcaa0c12 authored by Jia-Ju Bai's avatar Jia-Ju Bai Committed by Martin K. Petersen
Browse files

scsi: atp870u: Replace mdelay() with msleep() 



tscam(), atp870_init(), atp880_init() and atp885_init() are never
called in atomic context.
They call mdelay() to busily wait, which is not necessary.
mdelay() can be replaced with msleep().

This is found by a static analysis tool named DCNS written by myself.

Signed-off-by: default avatarJia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d6aec1ca

drivers/scsi/atp870u.c

+8 −8
Original line number Diff line number Diff line
@@ -1055,7 +1055,7 @@ static void tscam(struct Scsi_Host *host, bool wide_chip, u8 scam_on) 
	udelay(2);		/* 2 deskew delay(45ns*2=90ns) */

	val &= 0x007f;		/* no bsy  */

	atp_writew_io(dev, 0, 0x1c, val);

	mdelay(128);

	msleep(128);

	val &= 0x00fb;		/* after 1ms no msg */

	atp_writew_io(dev, 0, 0x1c, val);

	while ((atp_readb_io(dev, 0, 0x1c) & 0x04) != 0)
@@ -1286,9 +1286,9 @@ static void atp870_init(struct Scsi_Host *shpnt) 
	k = (atp_readb_base(atpdev, 0x3a) & 0xf3) | 0x10;

	atp_writeb_base(atpdev, 0x3a, k);

	atp_writeb_base(atpdev, 0x3a, k & 0xdf);

	mdelay(32);

	msleep(32);

	atp_writeb_base(atpdev, 0x3a, k);

	mdelay(32);

	msleep(32);

	atp_set_host_id(atpdev, 0, host_id);



	tscam(shpnt, wide_chip, scam_on);
@@ -1370,9 +1370,9 @@ static void atp880_init(struct Scsi_Host *shpnt) 
	k = atp_readb_base(atpdev, 0x38) & 0x80;

	atp_writeb_base(atpdev, 0x38, k);

	atp_writeb_base(atpdev, 0x3b, 0x20);

	mdelay(32);

	msleep(32);

	atp_writeb_base(atpdev, 0x3b, 0);

	mdelay(32);

	msleep(32);

	atp_readb_io(atpdev, 0, 0x1b);

	atp_readb_io(atpdev, 0, 0x17);
@@ -1454,10 +1454,10 @@ static void atp885_init(struct Scsi_Host *shpnt) 
	atp_writeb_base(atpdev, 0x28, k);

	atp_writeb_pci(atpdev, 0, 1, 0x80);

	atp_writeb_pci(atpdev, 1, 1, 0x80);

	mdelay(100);

	msleep(100);

	atp_writeb_pci(atpdev, 0, 1, 0);

	atp_writeb_pci(atpdev, 1, 1, 0);

	mdelay(1000);

	msleep(1000);

	atp_readb_io(atpdev, 0, 0x1b);

	atp_readb_io(atpdev, 0, 0x17);

	atp_readb_io(atpdev, 1, 0x1b);
@@ -1473,7 +1473,7 @@ static void atp885_init(struct Scsi_Host *shpnt) 
		k = (k & 0x07) | 0x40;

	atp_set_host_id(atpdev, 1, k);



	mdelay(600); /* this delay used to be called tscam_885() */

	msleep(600); /* this delay used to be called tscam_885() */

	dev_info(&pdev->dev, "Scanning Channel A SCSI Device ...\n");

	atp_is(atpdev, 0, true, atp_readb_io(atpdev, 0, 0x1b) >> 7);

	atp_writeb_io(atpdev, 0, 0x16, 0x80);