net: ks8851: Clean up chip ID readout

[oweals/u-boot.git] / lib / hashtable.c

diff --git a/lib/hashtable.c b/lib/hashtable.c
index 574ec6af8653dea2d9104367293e43979974cda0..b96dbe19be4dd52e0233e9d452f3201f6c57ad69 100644 (file)
--- a/lib/hashtable.c
+++ b/lib/hashtable.c
@@ -13,6 +13,7 @@
  */
 
 #include <errno.h>
+#include <log.h>
 #include <malloc.h>
 #include <sort.h>
 
@@ -226,8 +227,10 @@ static int
 do_callback(const struct env_entry *e, const char *name, const char *value,
            enum env_op op, int flags)
 {
+#ifndef CONFIG_SPL_BUILD
        if (e->callback)
                return e->callback(name, value, op, flags);
+#endif
        return 0;
 }
 
@@ -448,7 +451,6 @@ static void _hdelete(const char *key, struct hsearch_data *htab,
        debug("hdelete: DELETING key \"%s\"\n", key);
        free((void *)ep->key);
        free(ep->data);
-       ep->callback = NULL;
        ep->flags = 0;
        htab->table[idx].used = USED_DELETED;
 
@@ -604,7 +606,7 @@ static int match_entry(struct env_entry *ep, int flag, int argc,
 
 ssize_t hexport_r(struct hsearch_data *htab, const char sep, int flag,
                 char **resp, size_t size,
-                int argc, char * const argv[])
+                int argc, char *const argv[])
 {
        struct env_entry *list[htab->size];
        char *res, *p;