diff options
author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2016-02-04 04:16:18 -0500 |
---|---|---|
committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2016-05-05 17:51:51 -0400 |
commit | aab616e31d1c7ec3726f7f5cbdaaec98759ebe93 (patch) | |
tree | 4e05a14a567d7db3660efcb4e08f550f24f52a2b /include/linux/mtd | |
parent | 7f2b092c9eeda055ae60af194a8edacaea5f7a10 (diff) |
mtd: kill the nand_ecclayout struct
Now that all MTD drivers have moved to the mtd_ooblayout_ops model we can
safely remove the struct nand_ecclayout definition, and all the remaining
places where it was still used.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Diffstat (limited to 'include/linux/mtd')
-rw-r--r-- | include/linux/mtd/mtd.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 177bf314ad70..29a170612203 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h | |||
@@ -96,21 +96,6 @@ struct mtd_oob_ops { | |||
96 | 96 | ||
97 | #define MTD_MAX_OOBFREE_ENTRIES_LARGE 32 | 97 | #define MTD_MAX_OOBFREE_ENTRIES_LARGE 32 |
98 | #define MTD_MAX_ECCPOS_ENTRIES_LARGE 640 | 98 | #define MTD_MAX_ECCPOS_ENTRIES_LARGE 640 |
99 | /* | ||
100 | * Internal ECC layout control structure. For historical reasons, there is a | ||
101 | * similar, smaller struct nand_ecclayout_user (in mtd-abi.h) that is retained | ||
102 | * for export to user-space via the ECCGETLAYOUT ioctl. | ||
103 | * nand_ecclayout should be expandable in the future simply by the above macros. | ||
104 | * | ||
105 | * This structure is now deprecated, you should use struct nand_ecclayout_ops | ||
106 | * to describe your OOB layout. | ||
107 | */ | ||
108 | struct nand_ecclayout { | ||
109 | __u32 eccbytes; | ||
110 | __u32 eccpos[MTD_MAX_ECCPOS_ENTRIES_LARGE]; | ||
111 | struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES_LARGE]; | ||
112 | }; | ||
113 | |||
114 | /** | 99 | /** |
115 | * struct mtd_oob_region - oob region definition | 100 | * struct mtd_oob_region - oob region definition |
116 | * @offset: region offset | 101 | * @offset: region offset |
@@ -200,9 +185,6 @@ struct mtd_info { | |||
200 | const char *name; | 185 | const char *name; |
201 | int index; | 186 | int index; |
202 | 187 | ||
203 | /* [Deprecated] ECC layout structure pointer - read only! */ | ||
204 | struct nand_ecclayout *ecclayout; | ||
205 | |||
206 | /* OOB layout description */ | 188 | /* OOB layout description */ |
207 | const struct mtd_ooblayout_ops *ooblayout; | 189 | const struct mtd_ooblayout_ops *ooblayout; |
208 | 190 | ||
@@ -308,8 +290,6 @@ int mtd_ooblayout_set_databytes(struct mtd_info *mtd, const u8 *databuf, | |||
308 | int mtd_ooblayout_count_freebytes(struct mtd_info *mtd); | 290 | int mtd_ooblayout_count_freebytes(struct mtd_info *mtd); |
309 | int mtd_ooblayout_count_eccbytes(struct mtd_info *mtd); | 291 | int mtd_ooblayout_count_eccbytes(struct mtd_info *mtd); |
310 | 292 | ||
311 | void mtd_set_ecclayout(struct mtd_info *mtd, struct nand_ecclayout *ecclayout); | ||
312 | |||
313 | static inline void mtd_set_ooblayout(struct mtd_info *mtd, | 293 | static inline void mtd_set_ooblayout(struct mtd_info *mtd, |
314 | const struct mtd_ooblayout_ops *ooblayout) | 294 | const struct mtd_ooblayout_ops *ooblayout) |
315 | { | 295 | { |