treewide: replace with error() with pr_err()

[u-boot] / drivers / mmc / hi6220_dw_mmc.c

diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c
index 731458c18c5630a382e533ae38f169ea713c5211..44a8ef825f32c55251d69b86c9fedb677b1f7c63 100644 (file)
--- a/drivers/mmc/hi6220_dw_mmc.c
+++ b/drivers/mmc/hi6220_dw_mmc.c
@@ -8,7 +8,7 @@
 #include <common.h>
 #include <dwmmc.h>
 #include <malloc.h>
-#include <asm-generic/errno.h>
+#include <linux/errno.h>
 
 #define        DWMMC_MAX_CH_NUM                4
 
@@ -20,7 +20,7 @@
 
 static int hi6220_dwmci_core_init(struct dwmci_host *host, int index)
 {
-       host->name = "HiKey DWMMC";
+       host->name = "Hisilicon DWMMC";
 
        host->dev_index = index;
 
@@ -44,11 +44,11 @@ int hi6220_dwmci_add_port(int index, u32 regbase, int bus_width)
 
        host = calloc(1, sizeof(struct dwmci_host));
        if (!host) {
-               error("dwmci_host calloc failed!\n");
+               pr_err("dwmci_host calloc failed!\n");
                return -ENOMEM;
        }
 
-       host->ioaddr = (void *)regbase;
+       host->ioaddr = (void *)(ulong)regbase;
        host->buswidth = bus_width;
        host->bus_hz = MMC0_DEFAULT_FREQ;