diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2014-02-23 12:52:41 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-23 11:09:57 -0500 |
| commit | d2ec147a76d0e051db19d378cac3ee7721877717 (patch) | |
| tree | bd4e448fc7ad7c6e3ea5219d7657269d5ae87e2b /drivers/ata | |
| parent | 6ef95e87763fd69889655f4f14e499377a54d066 (diff) | |
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: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/ahci_sunxi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c index 001f7dfc467..d1bf3f786b0 100644 --- a/drivers/ata/ahci_sunxi.c +++ b/drivers/ata/ahci_sunxi.c @@ -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); |