Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux.git] / scripts / dtc / util.c

diff --git a/scripts/dtc/util.c b/scripts/dtc/util.c
index 9953c32a024473c60d5b9db39b3ed6fee5ba8532..a69b7a13463d8e525709978ba61581ea24d1d8ce 100644 (file)
--- a/scripts/dtc/util.c
+++ b/scripts/dtc/util.c
@@ -227,11 +227,11 @@ char get_escape_char(const char *s, int *i)
        return val;
 }
 
-int utilfdt_read_err_len(const char *filename, char **buffp, off_t *len)
+int utilfdt_read_err(const char *filename, char **buffp, size_t *len)
 {
        int fd = 0;     /* assume stdin */
        char *buf = NULL;
-       off_t bufsize = 1024, offset = 0;
+       size_t bufsize = 1024, offset = 0;
        int ret = 0;
 
        *buffp = NULL;
@@ -264,20 +264,15 @@ int utilfdt_read_err_len(const char *filename, char **buffp, off_t *len)
                free(buf);
        else
                *buffp = buf;
-       *len = bufsize;
+       if (len)
+               *len = bufsize;
        return ret;
 }
 
-int utilfdt_read_err(const char *filename, char **buffp)
-{
-       off_t len;
-       return utilfdt_read_err_len(filename, buffp, &len);
-}
-
-char *utilfdt_read_len(const char *filename, off_t *len)
+char *utilfdt_read(const char *filename, size_t *len)
 {
        char *buff;
-       int ret = utilfdt_read_err_len(filename, &buff, len);
+       int ret = utilfdt_read_err(filename, &buff, len);
 
        if (ret) {
                fprintf(stderr, "Couldn't open blob from '%s': %s\n", filename,
@@ -288,12 +283,6 @@ char *utilfdt_read_len(const char *filename, off_t *len)
        return buff;
 }
 
-char *utilfdt_read(const char *filename)
-{
-       off_t len;
-       return utilfdt_read_len(filename, &len);
-}
-
 int utilfdt_write_err(const char *filename, const void *blob)
 {
        int fd = 1;     /* assume stdout */