powerpc/usb: fix bug of CPU hang when missing USB PHY clock

[u-boot] / drivers / block / sata_sil.c

diff --git a/drivers/block/sata_sil.c b/drivers/block/sata_sil.c
index 5e7ef5e0de3174c42bb032ca4c037b60d0937110..245b872f993942ae02958f5563bc7475f504f83b 100644 (file)
--- a/drivers/block/sata_sil.c
+++ b/drivers/block/sata_sil.c
@@ -25,12 +25,12 @@
 #include <malloc.h>
 #include <asm/io.h>
 #include <fis.h>
+#include <sata.h>
 #include <libata.h>
 #include "sata_sil.h"
 
 /* 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;
@@ -370,7 +370,7 @@ static ulong sil_sata_rw_cmd_ext(int dev, ulong start, ulong blkcnt,
 }
 
 ulong sil_sata_rw_lba28(int dev, ulong blknr, lbaint_t blkcnt,
-               void *buffer, int is_write)
+               const void *buffer, int is_write)
 {
        ulong start, blks, max_blks;
        u8 *addr;
@@ -398,7 +398,7 @@ ulong sil_sata_rw_lba28(int dev, ulong blknr, lbaint_t blkcnt,
 }
 
 ulong sil_sata_rw_lba48(int dev, ulong blknr, lbaint_t blkcnt,
-               void *buffer, int is_write)
+               const void *buffer, int is_write)
 {
        ulong start, blks, max_blks;
        u8 *addr;
@@ -503,7 +503,7 @@ ulong sata_read(int dev, ulong blknr, lbaint_t blkcnt, void *buffer)
 /*
  * SATA interface between low level driver and command layer
  */
-ulong sata_write(int dev, ulong blknr, lbaint_t blkcnt, void *buffer)
+ulong sata_write(int dev, ulong blknr, lbaint_t blkcnt, const void *buffer)
 {
        struct sil_sata *sata = sata_dev_desc[dev].priv;
        ulong rc;