Factor out read_firmware_device()

common/cmd_cros_bootstub.c

 /*
  * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Alternatively, this software may be distributed under the terms of the
  * GNU General Public License ("GPL") version 2 as published by the Free
  * Software Foundation.
  */
 
@@ skipping 16 matching lines @@
         if (return_code != 0) \
                 printf(PREFIX "%s failed, returning %d\n", \
                                 #action, return_code); \
 } while (0)
 
 #define FIRMWARE_RECOVERY       0
 #define FIRMWARE_A              1
 #define FIRMWARE_B              2
 
 /*
- * Read <count> bytes, starting from <offset>, from firmware storage
- * device <file> into buffer <buf>.
- *
- * Return 0 on success, non-zero on error.
- */
-int read_firmware_device(firmware_storage_t *file, off_t offset, void *buf,
-                size_t count)
-{
-        ssize_t size;
-
-        if (file->seek(file->context, offset, SEEK_SET) < 0) {
-                debug(PREFIX "seek to address 0x%08x fail\n", offset);
-                return -1;
-        }
-
-        size = 0;
-        while (count > 0 &&
-                        (size = file->read(file->context, buf, count)) > 0) {
-                count -= size;
-                buf += size;
-        }
-
-        if (size < 0) {
-                debug(PREFIX "an error occur when read firmware: %d\n", size);
-                return -1;
-        }
-
-        if (count > 0) {
-                debug(PREFIX "cannot read all data: %d\n", count);
-                return -1;
-        }
-
-        return 0;
-}
-
-/*
  * Read verification block on <vblock_offset> from <file>.
  *
  * The pointer to verification block is stored in <vblock_ptr>, and the size of
  * the block is stored in <vblock_size_ptr>.
  *
  * On success, the space for storing verification block is malloc()'ed, and has
  * to be free()'ed by the caller.
  *
  * Return 0 if success, non-zero if fail.
  */
@@ skipping 284 matching lines @@
         firmware_data = malloc(CONFIG_LENGTH_RECOVERY);
         WARN_ON_FAILURE(load_firmware_data(firmware_data));
         jump_to_firmware((void (*)(void)) firmware_data);
 
         debug(PREFIX "error: should never reach here!\n");
         return 1;
 }
 
 U_BOOT_CMD(cros_bootstub, 1, 1, do_cros_bootstub, "verified boot stub firmware",
                 NULL);