SPDX: Convert all of our single license tags to Linux Kernel style

[u-boot] / env / ext4.c

diff --git a/env/ext4.c b/env/ext4.c
index 9cdf28e79f1a56399e2ca8f0982a4993a4ffc4cc..7626784ca6386bc2298e0a003fbec161f6fb9e25 100644 (file)
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (c) Copyright 2016 by VRT Technology
  *
@@ -15,8 +16,6 @@
  * EXT4 filesystem implementation in Uboot by
  * Uma Shankar <uma.shankar@samsung.com>
  * Manjunatha C Achar <a.manjunatha@samsung.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -31,8 +30,6 @@
 #include <ext4fs.h>
 #include <mmc.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 #ifdef CONFIG_CMD_SAVEENV
 static int env_ext4_save(void)
 {
@@ -87,6 +84,11 @@ static int env_ext4_load(void)
        int err;
        loff_t off;
 
+#ifdef CONFIG_MMC
+       if (!strcmp(CONFIG_ENV_EXT4_INTERFACE, "mmc"))
+               mmc_initialize(NULL);
+#endif
+
        part = blk_get_device_part_str(CONFIG_ENV_EXT4_INTERFACE,
                                       CONFIG_ENV_EXT4_DEVICE_AND_PART,
                                       &dev_desc, &info, 1);
@@ -114,8 +116,7 @@ static int env_ext4_load(void)
                goto err_env_relocate;
        }
 
-       env_import(buf, 1);
-       return 0;
+       return env_import(buf, 1);
 
 err_env_relocate:
        set_default_env(NULL);