diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-11-08 21:08:09 -0500 |
---|---|---|
committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2016-11-19 13:31:32 -0500 |
commit | 7c295ef9642c107203a485843853b12d6f5cdb39 (patch) | |
tree | f6386fb4add3f03d9746aa684831d61d990b5572 | |
parent | 8e8fd4d1e83ef7d64f260b4d8d928ab44cc1ce07 (diff) |
mtd: use min_t() to refactor mtd_ooblayout_{get, set}_bytes()
I hope this will make the code a little more readable.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-rw-r--r-- | drivers/mtd/mtdcore.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index cf85f2b2ca2c..ca6a89ab4663 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c | |||
@@ -1283,7 +1283,7 @@ static int mtd_ooblayout_get_bytes(struct mtd_info *mtd, u8 *buf, | |||
1283 | while (!ret) { | 1283 | while (!ret) { |
1284 | int cnt; | 1284 | int cnt; |
1285 | 1285 | ||
1286 | cnt = oobregion.length > nbytes ? nbytes : oobregion.length; | 1286 | cnt = min_t(int, nbytes, oobregion.length); |
1287 | memcpy(buf, oobbuf + oobregion.offset, cnt); | 1287 | memcpy(buf, oobbuf + oobregion.offset, cnt); |
1288 | buf += cnt; | 1288 | buf += cnt; |
1289 | nbytes -= cnt; | 1289 | nbytes -= cnt; |
@@ -1326,7 +1326,7 @@ static int mtd_ooblayout_set_bytes(struct mtd_info *mtd, const u8 *buf, | |||
1326 | while (!ret) { | 1326 | while (!ret) { |
1327 | int cnt; | 1327 | int cnt; |
1328 | 1328 | ||
1329 | cnt = oobregion.length > nbytes ? nbytes : oobregion.length; | 1329 | cnt = min_t(int, nbytes, oobregion.length); |
1330 | memcpy(oobbuf + oobregion.offset, buf, cnt); | 1330 | memcpy(oobbuf + oobregion.offset, buf, cnt); |
1331 | buf += cnt; | 1331 | buf += cnt; |
1332 | nbytes -= cnt; | 1332 | nbytes -= cnt; |