You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
1.4 KiB
48 lines
1.4 KiB
11 years ago
|
From 09de09bc2c236dccb0ed5ed38015e829550a5c28 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
||
|
|
Date: Sun, 23 Feb 2014 11:37:17 +0100
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
---
|
||
|
|
drivers/ata/ahci_sunxi.c | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c
|
||
|
|
index 001f7dfc..d1bf3f7 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);
|
||
|
|
|
||
|
|
--
|
||
|
|
1.8.5.5
|
||
|
|
|