pci: layerscape: Adjust the return value when ls_pcie_addr_valid() fails

[u-boot] / common / cmd_ubi.c

diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c
index 3c37c93f100e2390c5b5d2177bc94bbff3786c7b..753a4dba3d782965dedb421cfbdab0d62b1a128a 100644 (file)
--- a/common/cmd_ubi.c
+++ b/common/cmd_ubi.c
@@ -14,11 +14,12 @@
 #include <common.h>
 #include <command.h>
 #include <exports.h>
-
+#include <memalign.h>
 #include <nand.h>
 #include <onenand_uboot.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
+#include <linux/err.h>
 #include <ubi_uboot.h>
 #include <asm/errno.h>
 #include <jffs2/load_kernel.h>
@@ -50,33 +51,6 @@ int ubifs_is_mounted(void);
 void cmd_ubifs_umount(void);
 #endif
 
-static void ubi_dump_vol_info(const struct ubi_volume *vol)
-{
-       ubi_msg("volume information dump:");
-       ubi_msg("vol_id          %d", vol->vol_id);
-       ubi_msg("reserved_pebs   %d", vol->reserved_pebs);
-       ubi_msg("alignment       %d", vol->alignment);
-       ubi_msg("data_pad        %d", vol->data_pad);
-       ubi_msg("vol_type        %d", vol->vol_type);
-       ubi_msg("name_len        %d", vol->name_len);
-       ubi_msg("usable_leb_size %d", vol->usable_leb_size);
-       ubi_msg("used_ebs        %d", vol->used_ebs);
-       ubi_msg("used_bytes      %lld", vol->used_bytes);
-       ubi_msg("last_eb_bytes   %d", vol->last_eb_bytes);
-       ubi_msg("corrupted       %d", vol->corrupted);
-       ubi_msg("upd_marker      %d", vol->upd_marker);
-
-       if (vol->name_len <= UBI_VOL_NAME_MAX &&
-               strnlen(vol->name, vol->name_len + 1) == vol->name_len) {
-               ubi_msg("name            %s", vol->name);
-       } else {
-               ubi_msg("the 1st 5 characters of the name: %c%c%c%c%c",
-                               vol->name[0], vol->name[1], vol->name[2],
-                               vol->name[3], vol->name[4]);
-       }
-       printf("\n");
-}
-
 static void display_volume_info(struct ubi_device *ubi)
 {
        int i;
@@ -140,7 +114,7 @@ static int ubi_check(char *name)
                        return 0;
        }
 
-       return -EEXIST;
+       return 1;
 }
 
 
@@ -281,7 +255,7 @@ static int ubi_remove_vol(char *volume)
 
        return 0;
 out_err:
-       ubi_err("cannot remove volume %s, error %d", volume, err);
+       ubi_err(ubi, "cannot remove volume %s, error %d", volume, err);
        if (err < 0)
                err = -err;
        return err;
@@ -310,8 +284,8 @@ static int ubi_volume_continue_write(char *volume, void *buf, size_t size)
                        return -err;
 
                if (err) {
-                       ubi_warn("volume %d on UBI device %d is corrupted",
-                                       vol->vol_id, ubi->ubi_num);
+                       ubi_warn(ubi, "volume %d on UBI device %d is corrupt",
+                                vol->vol_id, ubi->ubi_num);
                        vol->corrupted = 1;
                }
 
@@ -389,7 +363,7 @@ int ubi_volume_read(char *volume, char *buf, size_t size)
        tbuf_size = vol->usable_leb_size;
        if (size < tbuf_size)
                tbuf_size = ALIGN(size, ubi->min_io_size);
-       tbuf = malloc(tbuf_size);
+       tbuf = malloc_cache_aligned(tbuf_size);
        if (!tbuf) {
                printf("NO MEM\n");
                return ENOMEM;