Prepare v2023.10

[platform/kernel/u-boot.git] / drivers / mtd / mtd_uboot.c

diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c
index 90767ec..14ce726 100644 (file)
--- a/drivers/mtd/mtd_uboot.c
+++ b/drivers/mtd/mtd_uboot.c
@@ -30,8 +30,6 @@ static const char *get_mtdids(void)
 
 #if defined(CONFIG_SYS_MTDPARTS_RUNTIME)
        board_mtdparts_default(&mtdids, &mtdparts);
-#elif defined(MTDIDS_DEFAULT)
-       mtdids = MTDIDS_DEFAULT;
 #elif defined(CONFIG_MTDIDS_DEFAULT)
        mtdids = CONFIG_MTDIDS_DEFAULT;
 #endif
@@ -54,7 +52,7 @@ static const char *get_mtdids(void)
  * @altname: Alternate name to return
  * @max_len: Length of the alternate name buffer
  *
- * @return 0 on success, an error otherwise.
+ * Return: 0 on success, an error otherwise.
  */
 int mtd_search_alternate_name(const char *mtdname, char *altname,
                              unsigned int max_len)
@@ -147,8 +145,6 @@ static const char *get_mtdparts(void)
 
 #if defined(CONFIG_SYS_MTDPARTS_RUNTIME)
        board_mtdparts_default(&mtdids, &mtdparts);
-#elif defined(MTDPARTS_DEFAULT)
-       mtdparts = MTDPARTS_DEFAULT;
 #elif defined(CONFIG_MTDPARTS_DEFAULT)
        mtdparts = CONFIG_MTDPARTS_DEFAULT;
 #endif