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

Commit d2ec147a authored by Hans de Goede's avatar Hans de Goede Committed by Tejun Heo
Browse files

ahci_sunxi: Use msleep instead of mdelay 



ahci_sunxi_phy_init is called from the probe and resume code paths, and
sleeping is safe in both, so use msleep instead of mdelay.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 6ef95e87

drivers/ata/ahci_sunxi.c

+3 −3
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static int ahci_sunxi_phy_init(struct device *dev, void __iomem *reg_base) 


	/* This magic is from the original code */

	writel(0, reg_base + AHCI_RWCR);

	mdelay(5);

	msleep(5);



	sunxi_setbits(reg_base + AHCI_PHYCS1R, BIT(19));

	sunxi_clrsetbits(reg_base + AHCI_PHYCS0R,
@@ -105,7 +105,7 @@ static int ahci_sunxi_phy_init(struct device *dev, void __iomem *reg_base) 
			 (0x7 << 20), (0x3 << 20));

	sunxi_clrsetbits(reg_base + AHCI_PHYCS2R,

			 (0x1f << 5), (0x19 << 5));

	mdelay(5);

	msleep(5);



	sunxi_setbits(reg_base + AHCI_PHYCS0R, (0x1 << 19));
@@ -137,7 +137,7 @@ static int ahci_sunxi_phy_init(struct device *dev, void __iomem *reg_base) 
		udelay(1);

	} while (1);



	mdelay(15);

	msleep(15);



	writel(0x7, reg_base + AHCI_RWCR);