From c4c9fbebae6a62d538817d0ccee698adaafc5d66 Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Wed, 12 Oct 2011 02:31:39 +0000 Subject: consolidate mdelay by providing a common function for all users There are several mdelay() definitions in the driver and board code. Remove them all and provide a common mdelay() in lib/time.c. Signed-off-by: Anatolij Gustschin Acked-by: Mike Frysinger --- arch/powerpc/cpu/mpc5xxx/usb_ohci.c | 1 - arch/powerpc/cpu/ppc4xx/usb_ohci.c | 1 - arch/powerpc/include/asm/4xx_pcie.h | 8 -------- 3 files changed, 10 deletions(-) (limited to 'arch/powerpc') diff --git a/arch/powerpc/cpu/mpc5xxx/usb_ohci.c b/arch/powerpc/cpu/mpc5xxx/usb_ohci.c index 7976e4d..2fc1180 100644 --- a/arch/powerpc/cpu/mpc5xxx/usb_ohci.c +++ b/arch/powerpc/cpu/mpc5xxx/usb_ohci.c @@ -1455,7 +1455,6 @@ static int hc_start (ohci_t * ohci) writel (RH_HS_LPSC, &ohci->regs->roothub.status); #endif /* OHCI_USE_NPS */ -#define mdelay(n) ({unsigned long msec=(n); while (msec--) udelay(1000);}) /* POTPGT delay is bits 24-31, in 2 ms units. */ mdelay ((roothub_a (ohci) >> 23) & 0x1fe); diff --git a/arch/powerpc/cpu/ppc4xx/usb_ohci.c b/arch/powerpc/cpu/ppc4xx/usb_ohci.c index a9edacd..fe091e3 100644 --- a/arch/powerpc/cpu/ppc4xx/usb_ohci.c +++ b/arch/powerpc/cpu/ppc4xx/usb_ohci.c @@ -1462,7 +1462,6 @@ static int hc_start (ohci_t * ohci) writel (RH_HS_LPSC, &ohci->regs->roothub.status); #endif /* OHCI_USE_NPS */ -#define mdelay(n) ({unsigned long msec=(n); while (msec--) udelay(1000);}) /* POTPGT delay is bits 24-31, in 2 ms units. */ mdelay ((roothub_a (ohci) >> 23) & 0x1fe); diff --git a/arch/powerpc/include/asm/4xx_pcie.h b/arch/powerpc/include/asm/4xx_pcie.h index 90e0bd9..fbdc28e 100644 --- a/arch/powerpc/include/asm/4xx_pcie.h +++ b/arch/powerpc/include/asm/4xx_pcie.h @@ -389,14 +389,6 @@ static inline int is_end_point(int port) return 0; } -static inline void mdelay(int n) -{ - u32 ms = n; - - while (ms--) - udelay(1000); -} - #if defined(PCIE0_SDR) static inline u32 sdr_base(int port) { -- cgit v1.1