fastboot: Rename public fb_ functions to fastboot_

Rename fb_mmc_flash_write/fb_mmc_erase/fb_nand_flash_write/fb_nand_erase to
fastboot_... as they form a public interface

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index 038905face36c4adb9004fe684d1f69ff17db6ef..47fcf74b6973e425fe1b4ef6b8725d9ed5aabe65 100644 (file)
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -251,8 +251,16 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc,
 }
 #endif
 
-void fb_mmc_flash_write(const char *cmd, void *download_buffer,
-                       unsigned int download_bytes, char *response)
+/**
+ * fastboot_mmc_flash_write() - Write image to eMMC for fastboot
+ *
+ * @cmd: Named partition to write image to
+ * @download_buffer: Pointer to image data
+ * @download_bytes: Size of image data
+ * @response: Pointer to fastboot response buffer
+ */
+void fastboot_mmc_flash_write(const char *cmd, void *download_buffer,
+                             unsigned int download_bytes, char *response)
 {
        struct blk_desc *dev_desc;
        disk_partition_t info;
@@ -349,7 +357,13 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,
        }
 }
 
-void fb_mmc_erase(const char *cmd, char *response)
+/**
+ * fastboot_mmc_flash_erase() - Erase eMMC for fastboot
+ *
+ * @cmd: Named partition to erase
+ * @response: Pointer to fastboot response buffer
+ */
+void fastboot_mmc_erase(const char *cmd, char *response)
 {
        int ret;
        struct blk_desc *dev_desc;

diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c
index 849a6f16a51dff49cc29dd7b23d7464283970bb0..535f541eb863ec06a60cd9c8dd9efc847240983b 100644 (file)
--- a/drivers/fastboot/fb_nand.c
+++ b/drivers/fastboot/fb_nand.c
@@ -145,8 +145,16 @@ static lbaint_t fb_nand_sparse_reserve(struct sparse_storage *info,
        return blkcnt + bad_blocks;
 }
 
-void fb_nand_flash_write(const char *cmd, void *download_buffer,
-                        unsigned int download_bytes, char *response)
+/**
+ * fastboot_nand_flash_write() - Write image to NAND for fastboot
+ *
+ * @cmd: Named device to write image to
+ * @download_buffer: Pointer to image data
+ * @download_bytes: Size of image data
+ * @response: Pointer to fastboot response buffer
+ */
+void fastboot_nand_flash_write(const char *cmd, void *download_buffer,
+                              unsigned int download_bytes, char *response)
 {
        struct part_info *part;
        struct mtd_info *mtd = NULL;
@@ -204,7 +212,13 @@ void fb_nand_flash_write(const char *cmd, void *download_buffer,
        fastboot_okay(NULL, response);
 }
 
-void fb_nand_erase(const char *cmd, char *response)
+/**
+ * fastboot_nand_flash_erase() - Erase NAND for fastboot
+ *
+ * @cmd: Named device to erase
+ * @response: Pointer to fastboot response buffer
+ */
+void fastboot_nand_erase(const char *cmd, char *response)
 {
        struct part_info *part;
        struct mtd_info *mtd = NULL;

diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 25784a193eb300a5eec34dc2fee141a018a5a89f..07d6a6215546c7f5ba2c41935d3daf91adf155ca 100644 (file)
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -577,12 +577,12 @@ static void cb_flash(struct usb_ep *ep, struct usb_request *req)
 
        fastboot_fail("no flash device defined", response);
 #ifdef CONFIG_FASTBOOT_FLASH_MMC
-       fb_mmc_flash_write(cmd, (void *)CONFIG_FASTBOOT_BUF_ADDR,
-                          download_bytes, response);
+       fastboot_mmc_flash_write(cmd, (void *)CONFIG_FASTBOOT_BUF_ADDR,
+                                download_bytes, response);
 #endif
 #ifdef CONFIG_FASTBOOT_FLASH_NAND
-       fb_nand_flash_write(cmd, (void *)CONFIG_FASTBOOT_BUF_ADDR,
-                           download_bytes, response);
+       fastboot_nand_flash_write(cmd, (void *)CONFIG_FASTBOOT_BUF_ADDR,
+                                 download_bytes, response);
 #endif
        fastboot_tx_write_str(response);
 }
@@ -625,10 +625,10 @@ static void cb_erase(struct usb_ep *ep, struct usb_request *req)
 
        fastboot_fail("no flash device defined", response);
 #ifdef CONFIG_FASTBOOT_FLASH_MMC
-       fb_mmc_erase(cmd, response);
+       fastboot_mmc_erase(cmd, response);
 #endif
 #ifdef CONFIG_FASTBOOT_FLASH_NAND
-       fb_nand_erase(cmd, response);
+       fastboot_nand_erase(cmd, response);
 #endif
        fastboot_tx_write_str(response);
 }

diff --git a/include/fb_mmc.h b/include/fb_mmc.h
index 39a960cc9d725fe9e43329d20032f5fd125bf16f..daca81a20179b9826024556f7d6e4696a8936ae0 100644 (file)
--- a/include/fb_mmc.h
+++ b/include/fb_mmc.h
@@ -3,6 +3,21 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
-void fb_mmc_flash_write(const char *cmd, void *download_buffer,
-                       unsigned int download_bytes, char *response);
-void fb_mmc_erase(const char *cmd, char *response);
+/**
+ * fastboot_mmc_flash_write() - Write image to eMMC for fastboot
+ *
+ * @cmd: Named partition to write image to
+ * @download_buffer: Pointer to image data
+ * @download_bytes: Size of image data
+ * @response: Pointer to fastboot response buffer
+ */
+void fastboot_mmc_flash_write(const char *cmd, void *download_buffer,
+                             unsigned int download_bytes, char *response);
+
+/**
+ * fastboot_mmc_flash_erase() - Erase eMMC for fastboot
+ *
+ * @cmd: Named partition to erase
+ * @response: Pointer to fastboot response buffer
+ */
+void fastboot_mmc_erase(const char *cmd, char *response);

diff --git a/include/fb_nand.h b/include/fb_nand.h
index 2c92a4eb50fda3f092bde81443837bccf31c4711..b5d4c0cc5f2a83306f0029bd8f5016d6f48106f0 100644 (file)
--- a/include/fb_nand.h
+++ b/include/fb_nand.h
@@ -4,6 +4,20 @@
  * Copyright 2015 Free Electrons.
  */
 
-void fb_nand_flash_write(const char *cmd, void *download_buffer,
-                        unsigned int download_bytes, char *response);
-void fb_nand_erase(const char *cmd, char *response);
+/**
+ * fastboot_nand_flash_write() - Write image to NAND for fastboot
+ *
+ * @cmd: Named device to write image to
+ * @download_buffer: Pointer to image data
+ * @download_bytes: Size of image data
+ * @response: Pointer to fastboot response buffer
+ */
+void fastboot_nand_flash_write(const char *cmd, void *download_buffer,
+                              unsigned int download_bytes, char *response);
+/**
+ * fastboot_nand_flash_erase() - Erase NAND for fastboot
+ *
+ * @cmd: Named device to erase
+ * @response: Pointer to fastboot response buffer
+ */
+void fastboot_nand_erase(const char *cmd, char *response);