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 --- drivers/block/fsl_sata.c | 7 ------- drivers/block/ftide020.c | 2 -- drivers/net/e1000.c | 1 - drivers/net/ftgmac100.c | 2 -- drivers/net/ne2000.c | 1 - drivers/net/ne2000_base.c | 1 - drivers/net/smc911x.c | 2 -- drivers/usb/host/ohci-hcd.c | 1 - drivers/usb/host/sl811-hcd.c | 2 -- 9 files changed, 19 deletions(-) (limited to 'drivers') diff --git a/drivers/block/fsl_sata.c b/drivers/block/fsl_sata.c index b101bd7..6b35173 100644 --- a/drivers/block/fsl_sata.c +++ b/drivers/block/fsl_sata.c @@ -50,13 +50,6 @@ static struct fsl_sata_info fsl_sata_info[] = { #endif }; -static inline void mdelay(unsigned long msec) -{ - unsigned long i; - for (i = 0; i < msec; i++) - udelay(1000); -} - static inline void sdelay(unsigned long sec) { unsigned long i; diff --git a/drivers/block/ftide020.c b/drivers/block/ftide020.c index 2eef3e9..4a7a07f 100644 --- a/drivers/block/ftide020.c +++ b/drivers/block/ftide020.c @@ -54,8 +54,6 @@ #define WRITE_CMD(x) outl((x), &ftide020->cmd_fifo) /* 0x04 */ #define READ_STATUS() inl(&ftide020->cmd_fifo) /* 0x04 */ -#define mdelay(n) ({unsigned long msec = (n); while (msec--) udelay(1000); }) - void ftide_set_device(int cx8, int dev) { static struct ftide020_s *ftide020 = (struct ftide020_s *) FTIDE_BASE; diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 98145bc..01bdf81 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -50,7 +50,6 @@ tested on both gig copper and gig fiber boards #define virt_to_bus(devno, v) pci_virt_to_mem(devno, (void *) (v)) #define bus_to_phys(devno, a) pci_mem_to_phys(devno, a) -#define mdelay(n) udelay((n)*1000) #define E1000_DEFAULT_PCI_PBA 0x00000030 #define E1000_DEFAULT_PCIE_PBA 0x000a0026 diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c index 821840f..0af0c34 100644 --- a/drivers/net/ftgmac100.c +++ b/drivers/net/ftgmac100.c @@ -33,8 +33,6 @@ #define ETH_ZLEN 60 -#define mdelay(n) ({unsigned long msec = (n); while (msec--) udelay(1000); }) - /* RBSR - hw default init value is also 0x640 */ #define RBSR_DEFAULT_VALUE 0x640 diff --git a/drivers/net/ne2000.c b/drivers/net/ne2000.c index 7a85314..3939158 100644 --- a/drivers/net/ne2000.c +++ b/drivers/net/ne2000.c @@ -78,7 +78,6 @@ Add SNMP /* NE2000 base header file */ #include "ne2000_base.h" -#define mdelay(n) udelay((n)*1000) /* find prom (taken from pc_net_cs.c from Linux) */ #include "8390.h" diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c index f93f932..f0cd2b6 100644 --- a/drivers/net/ne2000_base.c +++ b/drivers/net/ne2000_base.c @@ -77,7 +77,6 @@ Add SNMP #include #include -#define mdelay(n) udelay((n)*1000) /* forward definition of function used for the uboot interface */ void uboot_push_packet_len(int len); void uboot_push_tx_done(int key, int val); diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index a677fd4..e34b487 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -35,8 +35,6 @@ u32 pkt_data_pull(struct eth_device *dev, u32 addr) \ void pkt_data_push(struct eth_device *dev, u32 addr, u32 val) \ __attribute__ ((weak, alias ("smc911x_reg_write"))); -#define mdelay(n) udelay((n)*1000) - static void smc911x_handle_mac_address(struct eth_device *dev) { unsigned long addrh, addrl; diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index c20d706..60c9595 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -1749,7 +1749,6 @@ static int hc_start(ohci_t *ohci) 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/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c index 82a8b36..c713d42 100644 --- a/drivers/usb/host/sl811-hcd.c +++ b/drivers/usb/host/sl811-hcd.c @@ -51,8 +51,6 @@ #define SL811_ADR (0x50000000) #define SL811_DAT (0x50000001) -#define mdelay(n) ({unsigned long msec=(n); while (msec--) udelay(1000);}) - #ifdef SL811_DEBUG static int debug = 9; #endif -- cgit v1.1