| Message ID | 1335343403-4405-1-git-send-email-agust@denx.de |
|---|---|
| State | Accepted |
| Commit | fe749d3728b281cd0b986c82eed30c64b3450ce7 |
| Delegated to: | Anatolij Gustschin |
| Headers | show |
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
On Wed, 25 Apr 2012 10:43:23 +0200 Anatolij Gustschin <agust@denx.de> wrote: > Drop mdelay() macros since we already have a common mdelay() func. > > Signed-off-by: Anatolij Gustschin <agust@denx.de> > --- > drivers/block/sata_sil.c | 1 - > drivers/video/da8xx-fb.c | 1 - > 2 files changed, 0 insertions(+), 2 deletions(-) Applied to u-boot-staging/agust@denx.de.
Dear Anatolij Gustschin, In message <1335343403-4405-1-git-send-email-agust@denx.de> you wrote: > Drop mdelay() macros since we already have a common mdelay() func. > > Signed-off-by: Anatolij Gustschin <agust@denx.de> > --- > drivers/block/sata_sil.c | 1 - > drivers/video/da8xx-fb.c | 1 - > 2 files changed, 0 insertions(+), 2 deletions(-) Applied, thanks. Best regards, Wolfgang Denk
diff --git a/drivers/block/sata_sil.c b/drivers/block/sata_sil.c index 5e7ef5e..fb7cd2a 100644 --- a/drivers/block/sata_sil.c +++ b/drivers/block/sata_sil.c @@ -30,7 +30,6 @@ /* Convert sectorsize to wordsize */ #define ATA_SECTOR_WORDS (ATA_SECT_SIZE/2) -#define mdelay(n) udelay((n)*1000) #define virt_to_bus(devno, v) pci_virt_to_mem(devno, (void *) (v)) static struct sata_info sata_info; diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c index a2981b1..30c19b3 100644 --- a/drivers/video/da8xx-fb.c +++ b/drivers/video/da8xx-fb.c @@ -121,7 +121,6 @@ struct da8xx_lcd_regs { #define LOWER_MARGIN 32 #define calc_fbsize() (panel.plnSizeX * panel.plnSizeY * panel.gdfBytesPP) -#define mdelay(n) ({unsigned long msec = (n); while (msec--) udelay(1000); }) static struct da8xx_lcd_regs *da8xx_fb_reg_base;
Drop mdelay() macros since we already have a common mdelay() func. Signed-off-by: Anatolij Gustschin <agust@denx.de> --- drivers/block/sata_sil.c | 1 - drivers/video/da8xx-fb.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-)