diff options
author | Tom Rini <trini@konsulko.com> | 2021-10-23 17:49:28 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-10-23 17:49:28 +0300 |
commit | 355d1e24f6143c4839be3c015c191421c4e9449c (patch) | |
tree | ff68e868d404d117f3f9599740f83fd73c99c306 /include/linux | |
parent | f055f2e5a2038002519e5b9affbf259345f4ade9 (diff) | |
parent | b9cfd8b0911209e2ebec887e497510ee42f9e788 (diff) | |
download | u-boot-355d1e24f6143c4839be3c015c191421c4e9449c.tar.xz |
Merge https://source.denx.de/u-boot/custodians/u-boot-spi
- Fix mtd erase with mtdpart (Marek BehĂșn)
- NXP fspi driver fixes (Kuldeep Singh)
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/mtd/mtd.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 3b302fb8c3..7455400981 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -51,7 +51,6 @@ struct erase_info { u_long retries; unsigned dev; unsigned cell; - void (*callback) (struct erase_info *self); u_long priv; u_char state; struct erase_info *next; @@ -535,16 +534,6 @@ extern int unregister_mtd_user (struct mtd_notifier *old); #endif void *mtd_kmalloc_up_to(const struct mtd_info *mtd, size_t *size); -#ifdef CONFIG_MTD_PARTITIONS -void mtd_erase_callback(struct erase_info *instr); -#else -static inline void mtd_erase_callback(struct erase_info *instr) -{ - if (instr->callback) - instr->callback(instr); -} -#endif - static inline int mtd_is_bitflip(int err) { return err == -EUCLEAN; } |