u-boot: remove driver lookup loop from env_save()

[oweals/u-boot.git] / env / env.c

diff --git a/env/env.c b/env/env.c
index 5c0842ac07eb2d728fef5f349ab0cd8d1b26dc73..e033b461244808b81df25aa0e02785e5f3c30463 100644 (file)
--- a/env/env.c
+++ b/env/env.c
@@ -119,21 +119,12 @@ static void env_set_inited(enum env_location location)
  */
 __weak enum env_location env_get_location(enum env_operation op, int prio)
 {
-       switch (op) {
-       case ENVOP_GET_CHAR:
-       case ENVOP_INIT:
-       case ENVOP_LOAD:
-               if (prio >= ARRAY_SIZE(env_locations))
-                       return ENVL_UNKNOWN;
-
-               gd->env_load_location = env_locations[prio];
-               return gd->env_load_location;
-
-       case ENVOP_SAVE:
-               return gd->env_load_location;
-       }
+       if (prio >= ARRAY_SIZE(env_locations))
+               return ENVL_UNKNOWN;
+
+       gd->env_load_prio = prio;
 
-       return ENVL_UNKNOWN;
+       return env_locations[prio];
 }
 
 
@@ -205,22 +196,29 @@ int env_load(void)
                        return 0;
        }
 
+       /*
+        * In case of invalid environment, we set the 'default' env location
+        * to the highest priority. In this way, next calls to env_save()
+        * will restore the environment at the right place.
+        */
+       env_get_location(ENVOP_LOAD, 0);
+
        return -ENODEV;
 }
 
 int env_save(void)
 {
        struct env_driver *drv;
-       int prio;
 
-       for (prio = 0; (drv = env_driver_lookup(ENVOP_SAVE, prio)); prio++) {
+       drv = env_driver_lookup(ENVOP_SAVE, gd->env_load_prio);
+       if (drv) {
                int ret;
 
                if (!drv->save)
-                       continue;
+                       return -ENODEV;
 
                if (!env_has_inited(drv->location))
-                       continue;
+                       return -ENODEV;
 
                printf("Saving Environment to %s... ", drv->name);
                ret = drv->save();