android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ahci_sunxi: Use msleep instead of mdelay

Browse Source 
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: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Hans de Goede 2014-02-23 12:52:41 +01:00 committed by Tejun Heo
parent 6ef95e8776
commit d2ec147a76
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/ata/ahci_sunxi.c
View File

@ -90,7 +90,7 @@ static int ahci_sunxi_phy_init(struct device *dev, void __iomem *reg_base)
/* This magic is from the original code */ /* This magic is from the original code */
writel(0, reg_base + AHCI_RWCR); writel(0, reg_base + AHCI_RWCR);
mdelay(5); msleep(5);
sunxi_setbits(reg_base + AHCI_PHYCS1R, BIT(19)); sunxi_setbits(reg_base + AHCI_PHYCS1R, BIT(19));
sunxi_clrsetbits(reg_base + AHCI_PHYCS0R, 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)); (0x7 << 20), (0x3 << 20));
sunxi_clrsetbits(reg_base + AHCI_PHYCS2R, sunxi_clrsetbits(reg_base + AHCI_PHYCS2R,
(0x1f << 5), (0x19 << 5)); (0x1f << 5), (0x19 << 5));
mdelay(5); msleep(5);
sunxi_setbits(reg_base + AHCI_PHYCS0R, (0x1 << 19)); 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); udelay(1);
} while (1); } while (1);
mdelay(15); msleep(15);
writel(0x7, reg_base + AHCI_RWCR); writel(0x7, reg_base + AHCI_RWCR);