target/linux/sunxi/patches-3.13/163-ahci_sunxi-use-mdelay.patch

   1 From 09de09bc2c236dccb0ed5ed38015e829550a5c28 Mon Sep 17 00:00:00 2001
   2 From: Hans de Goede <hdegoede@redhat.com>
   3 Date: Sun, 23 Feb 2014 11:37:17 +0100
   4 Subject: [PATCH] ahci_sunxi: Use msleep instead of mdelay
   5
   6 ahci_sunxi_phy_init is called from the probe and resume code paths, and
   7 sleeping is safe in both, so use msleep instead of mdelay.
   8
   9 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  10 ---
  11  drivers/ata/ahci_sunxi.c | 6 +++---
  12  1 file changed, 3 insertions(+), 3 deletions(-)
  13
  14 diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c
  15 index 001f7dfc..d1bf3f7 100644
  16 --- a/drivers/ata/ahci_sunxi.c
  17 +++ b/drivers/ata/ahci_sunxi.c
  18 @@ -90,7 +90,7 @@ static int ahci_sunxi_phy_init(struct device *dev, void __iomem *reg_base)
  19
  20         /* This magic is from the original code */
  21         writel(0, reg_base + AHCI_RWCR);
  22 -       mdelay(5);
  23 +       msleep(5);
  24
  25         sunxi_setbits(reg_base + AHCI_PHYCS1R, BIT(19));
  26         sunxi_clrsetbits(reg_base + AHCI_PHYCS0R,
  27 @@ -105,7 +105,7 @@ static int ahci_sunxi_phy_init(struct device *dev, void __iomem *reg_base)
  28                          (0x7 << 20), (0x3 << 20));
  29         sunxi_clrsetbits(reg_base + AHCI_PHYCS2R,
  30                          (0x1f << 5), (0x19 << 5));
  31 -       mdelay(5);
  32 +       msleep(5);
  33
  34         sunxi_setbits(reg_base + AHCI_PHYCS0R, (0x1 << 19));
  35
  36 @@ -137,7 +137,7 @@ static int ahci_sunxi_phy_init(struct device *dev, void __iomem *reg_base)
  37                 udelay(1);
  38         } while (1);
  39
  40 -       mdelay(15);
  41 +       msleep(15);
  42
  43         writel(0x7, reg_base + AHCI_RWCR);
  44
  45 --
  46 1.8.5.5
  47