mmc: sdhci: use the generic error number

Use the generic error number instead of meaningless value.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c
index c1d870098f0749be39ca6b34709d1125b26ad031..cb2bd40c65ee198753853c401e48ed8df3156a93 100644 (file)
--- a/drivers/mmc/bcm2835_sdhci.c
+++ b/drivers/mmc/bcm2835_sdhci.c
@@ -157,7 +157,7 @@ int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq)
        bcm_host = calloc(1, sizeof(*bcm_host));
        if (!bcm_host) {
                printf("sdhci_host calloc fail!\n");
-               return 1;
+               return -ENOMEM;
        }
 
        /*

diff --git a/drivers/mmc/ftsdc021_sdhci.c b/drivers/mmc/ftsdc021_sdhci.c
index 1f6cdba17349dc860a1a45e835ef92c3a2c2f934..6e9fefab33e2b0204dd80d31a014241a2e8d17c4 100644 (file)
--- a/drivers/mmc/ftsdc021_sdhci.c
+++ b/drivers/mmc/ftsdc021_sdhci.c
@@ -21,7 +21,7 @@ int ftsdc021_sdhci_init(u32 regbase)
        host = calloc(1, sizeof(struct sdhci_host));
        if (!host) {
                puts("sdh_host malloc fail!\n");
-               return 1;
+               return -ENOMEM;
        }
 
        host->name = "FTSDC021";

diff --git a/drivers/mmc/kona_sdhci.c b/drivers/mmc/kona_sdhci.c
index c67a262c7ae8272b92b5b2fc72540a85982a4ebb..549f6bcbbdc2bfd16adad1c6ce9ff39c479afc96 100644 (file)
--- a/drivers/mmc/kona_sdhci.c
+++ b/drivers/mmc/kona_sdhci.c
@@ -27,7 +27,7 @@ static int init_kona_mmc_core(struct sdhci_host *host)
 
        if (sdhci_readb(host, SDHCI_SOFTWARE_RESET) & SDHCI_RESET_ALL) {
                printf("%s: sd host controller reset error\n", __func__);
-               return 1;
+               return -EBUSY;
        }
 
        /* For kona a hardware reset before anything else. */
@@ -39,7 +39,7 @@ static int init_kona_mmc_core(struct sdhci_host *host)
        do {
                if (timeout == 0) {
                        printf("%s: reset timeout error\n", __func__);
-                       return 1;
+                       return -ETIMEDOUT;
                }
                timeout--;
                udelay(100);
@@ -67,7 +67,7 @@ static int init_kona_mmc_core(struct sdhci_host *host)
        while (!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT)) {
                if (timeout == 0) {
                        printf("%s: CARD DETECT timeout error\n", __func__);
-                       return 1;
+                       return -ETIMEDOUT;
                }
                timeout--;
                udelay(100);

diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
index ca5f8724a3facf72c883da748b9558c770801bb2..e388ad171b54a33903b643ad910c0b405ef854c5 100644 (file)
--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
@@ -71,7 +71,7 @@ int mv_sdh_init(unsigned long regbase, u32 max_clk, u32 min_clk, u32 quirks)
        host = (struct sdhci_host *)malloc(sizeof(struct sdhci_host));
        if (!host) {
                printf("sdh_host malloc fail!\n");
-               return 1;
+               return -ENOMEM;
        }
 
        host->name = MVSDH_NAME;

diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index d7cfa3e2e9e9769297a15132186aa66e292e6d32..b329bef5fd4261e8d40e4a0b32f2d0c5b9f0beec 100644 (file)
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -100,7 +100,7 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width)
        struct sdhci_host *host = calloc(1, sizeof(struct sdhci_host));
        if (!host) {
                printf("sdhci__host allocation fail!\n");
-               return 1;
+               return -ENOMEM;
        }
        host->ioaddr = (void *)regbase;
        host->index = index;
@@ -154,7 +154,7 @@ static int sdhci_get_config(const void *blob, int node, struct sdhci_host *host)
        dev_id = pinmux_decode_periph_id(blob, node);
        if (dev_id < PERIPH_ID_SDMMC0 && dev_id > PERIPH_ID_SDMMC3) {
                debug("MMC: Can't get device id\n");
-               return -1;
+               return -EINVAL;
        }
        host->index = dev_id - PERIPH_ID_SDMMC0;
 
@@ -162,7 +162,7 @@ static int sdhci_get_config(const void *blob, int node, struct sdhci_host *host)
        bus_width = fdtdec_get_int(blob, node, "samsung,bus-width", 0);
        if (bus_width <= 0) {
                debug("MMC: Can't get bus-width\n");
-               return -1;
+               return -EINVAL;
        }
        host->bus_width = bus_width;
 
@@ -170,7 +170,7 @@ static int sdhci_get_config(const void *blob, int node, struct sdhci_host *host)
        base = fdtdec_get_addr(blob, node, "reg");
        if (!base) {
                debug("MMC: Can't get base address\n");
-               return -1;
+               return -EINVAL;
        }
        host->ioaddr = (void *)base;
 

diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 73377227befbd9e53533124677eb72ca6e7d8763..837c53842b3802700ca192692c9ead0e2d220590 100644 (file)
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -87,7 +87,7 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data,
                if (stat & SDHCI_INT_ERROR) {
                        printf("%s: Error detected in status(0x%X)!\n",
                               __func__, stat);
-                       return -1;
+                       return -EIO;
                }
                if (stat & rdy) {
                        if (!(sdhci_readl(host, SDHCI_PRESENT_STATE) & mask))
@@ -110,7 +110,7 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data,
                        udelay(10);
                else {
                        printf("%s: Transfer data timeout\n", __func__);
-                       return -1;
+                       return -ETIMEDOUT;
                }
        } while (!(stat & SDHCI_INT_DATA_END));
        return 0;
@@ -303,7 +303,7 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
                if (timeout == 0) {
                        printf("%s: Timeout to wait cmd & data inhibit\n",
                               __func__);
-                       return -1;
+                       return -EBUSY;
                }
 
                timeout--;
@@ -374,7 +374,7 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
                if (timeout == 0) {
                        printf("%s: Internal clock never stabilised.\n",
                               __func__);
-                       return -1;
+                       return -EBUSY;
                }
                timeout--;
                udelay(1000);
@@ -477,7 +477,7 @@ static int sdhci_init(struct mmc *mmc)
                if (!aligned_buffer) {
                        printf("%s: Aligned buffer alloc failed!!!\n",
                               __func__);
-                       return -1;
+                       return -ENOMEM;
                }
        }
 
@@ -631,7 +631,7 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
        host->mmc = mmc_create(&host->cfg, host);
        if (host->mmc == NULL) {
                printf("%s: mmc create fail!\n", __func__);
-               return -1;
+               return -ENOMEM;
        }
 
        return 0;