diff options
author | Brian Norris <computersforpeace@gmail.com> | 2011-08-30 21:45:40 -0400 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@intel.com> | 2011-09-11 08:28:59 -0400 |
commit | 0612b9ddc2eeda014dd805c87c752b342d8f80f0 (patch) | |
tree | 7691ee548ab6da1e7df946a75abd96a814208d8e /drivers/mtd/nand | |
parent | 905c6bcdb42616da717a9bd6c0c5870dbd90b09e (diff) |
mtd: rename MTD_OOB_* to MTD_OPS_*
These modes are not necessarily for OOB only. Particularly, MTD_OOB_RAW
affected operations on in-band page data as well. To clarify these
options and to emphasize that their effect is applied per-operation, we
change the primary prefix to MTD_OPS_.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r-- | drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/nand_base.c | 40 | ||||
-rw-r--r-- | drivers/mtd/nand/nand_bbt.c | 8 | ||||
-rw-r--r-- | drivers/mtd/nand/sm_common.c | 2 |
4 files changed, 26 insertions, 26 deletions
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index 5c0fe0dd705..071b63420f0 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c | |||
@@ -1104,7 +1104,7 @@ gpmi_ecc_write_oob(struct mtd_info *mtd, struct nand_chip *chip, int page) | |||
1104 | * The BCH will use all the (page + oob). | 1104 | * The BCH will use all the (page + oob). |
1105 | * Our gpmi_hw_ecclayout can only prohibit the JFFS2 to write the oob. | 1105 | * Our gpmi_hw_ecclayout can only prohibit the JFFS2 to write the oob. |
1106 | * But it can not stop some ioctls such MEMWRITEOOB which uses | 1106 | * But it can not stop some ioctls such MEMWRITEOOB which uses |
1107 | * MTD_OOB_PLACE. So We have to implement this function to prohibit | 1107 | * MTD_OPS_PLACE_OOB. So We have to implement this function to prohibit |
1108 | * these ioctls too. | 1108 | * these ioctls too. |
1109 | */ | 1109 | */ |
1110 | return -EPERM; | 1110 | return -EPERM; |
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index ad40607f5f2..686b5577011 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c | |||
@@ -1382,12 +1382,12 @@ static uint8_t *nand_transfer_oob(struct nand_chip *chip, uint8_t *oob, | |||
1382 | { | 1382 | { |
1383 | switch (ops->mode) { | 1383 | switch (ops->mode) { |
1384 | 1384 | ||
1385 | case MTD_OOB_PLACE: | 1385 | case MTD_OPS_PLACE_OOB: |
1386 | case MTD_OOB_RAW: | 1386 | case MTD_OPS_RAW: |
1387 | memcpy(oob, chip->oob_poi + ops->ooboffs, len); | 1387 | memcpy(oob, chip->oob_poi + ops->ooboffs, len); |
1388 | return oob + len; | 1388 | return oob + len; |
1389 | 1389 | ||
1390 | case MTD_OOB_AUTO: { | 1390 | case MTD_OPS_AUTO_OOB: { |
1391 | struct nand_oobfree *free = chip->ecc.layout->oobfree; | 1391 | struct nand_oobfree *free = chip->ecc.layout->oobfree; |
1392 | uint32_t boffs = 0, roffs = ops->ooboffs; | 1392 | uint32_t boffs = 0, roffs = ops->ooboffs; |
1393 | size_t bytes = 0; | 1393 | size_t bytes = 0; |
@@ -1437,7 +1437,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, | |||
1437 | int ret = 0; | 1437 | int ret = 0; |
1438 | uint32_t readlen = ops->len; | 1438 | uint32_t readlen = ops->len; |
1439 | uint32_t oobreadlen = ops->ooblen; | 1439 | uint32_t oobreadlen = ops->ooblen; |
1440 | uint32_t max_oobsize = ops->mode == MTD_OOB_AUTO ? | 1440 | uint32_t max_oobsize = ops->mode == MTD_OPS_AUTO_OOB ? |
1441 | mtd->oobavail : mtd->oobsize; | 1441 | mtd->oobavail : mtd->oobsize; |
1442 | 1442 | ||
1443 | uint8_t *bufpoi, *oob, *buf; | 1443 | uint8_t *bufpoi, *oob, *buf; |
@@ -1469,7 +1469,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, | |||
1469 | } | 1469 | } |
1470 | 1470 | ||
1471 | /* Now read the page into the buffer */ | 1471 | /* Now read the page into the buffer */ |
1472 | if (unlikely(ops->mode == MTD_OOB_RAW)) | 1472 | if (unlikely(ops->mode == MTD_OPS_RAW)) |
1473 | ret = chip->ecc.read_page_raw(mtd, chip, | 1473 | ret = chip->ecc.read_page_raw(mtd, chip, |
1474 | bufpoi, page); | 1474 | bufpoi, page); |
1475 | else if (!aligned && NAND_SUBPAGE_READ(chip) && !oob) | 1475 | else if (!aligned && NAND_SUBPAGE_READ(chip) && !oob) |
@@ -1759,7 +1759,7 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from, | |||
1759 | 1759 | ||
1760 | stats = mtd->ecc_stats; | 1760 | stats = mtd->ecc_stats; |
1761 | 1761 | ||
1762 | if (ops->mode == MTD_OOB_AUTO) | 1762 | if (ops->mode == MTD_OPS_AUTO_OOB) |
1763 | len = chip->ecc.layout->oobavail; | 1763 | len = chip->ecc.layout->oobavail; |
1764 | else | 1764 | else |
1765 | len = mtd->oobsize; | 1765 | len = mtd->oobsize; |
@@ -1787,7 +1787,7 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from, | |||
1787 | page = realpage & chip->pagemask; | 1787 | page = realpage & chip->pagemask; |
1788 | 1788 | ||
1789 | while (1) { | 1789 | while (1) { |
1790 | if (ops->mode == MTD_OOB_RAW) | 1790 | if (ops->mode == MTD_OPS_RAW) |
1791 | sndcmd = chip->ecc.read_oob_raw(mtd, chip, page, sndcmd); | 1791 | sndcmd = chip->ecc.read_oob_raw(mtd, chip, page, sndcmd); |
1792 | else | 1792 | else |
1793 | sndcmd = chip->ecc.read_oob(mtd, chip, page, sndcmd); | 1793 | sndcmd = chip->ecc.read_oob(mtd, chip, page, sndcmd); |
@@ -1865,9 +1865,9 @@ static int nand_read_oob(struct mtd_info *mtd, loff_t from, | |||
1865 | nand_get_device(chip, mtd, FL_READING); | 1865 | nand_get_device(chip, mtd, FL_READING); |
1866 | 1866 | ||
1867 | switch (ops->mode) { | 1867 | switch (ops->mode) { |
1868 | case MTD_OOB_PLACE: | 1868 | case MTD_OPS_PLACE_OOB: |
1869 | case MTD_OOB_AUTO: | 1869 | case MTD_OPS_AUTO_OOB: |
1870 | case MTD_OOB_RAW: | 1870 | case MTD_OPS_RAW: |
1871 | break; | 1871 | break; |
1872 | 1872 | ||
1873 | default: | 1873 | default: |
@@ -2113,12 +2113,12 @@ static uint8_t *nand_fill_oob(struct mtd_info *mtd, uint8_t *oob, size_t len, | |||
2113 | 2113 | ||
2114 | switch (ops->mode) { | 2114 | switch (ops->mode) { |
2115 | 2115 | ||
2116 | case MTD_OOB_PLACE: | 2116 | case MTD_OPS_PLACE_OOB: |
2117 | case MTD_OOB_RAW: | 2117 | case MTD_OPS_RAW: |
2118 | memcpy(chip->oob_poi + ops->ooboffs, oob, len); | 2118 | memcpy(chip->oob_poi + ops->ooboffs, oob, len); |
2119 | return oob + len; | 2119 | return oob + len; |
2120 | 2120 | ||
2121 | case MTD_OOB_AUTO: { | 2121 | case MTD_OPS_AUTO_OOB: { |
2122 | struct nand_oobfree *free = chip->ecc.layout->oobfree; | 2122 | struct nand_oobfree *free = chip->ecc.layout->oobfree; |
2123 | uint32_t boffs = 0, woffs = ops->ooboffs; | 2123 | uint32_t boffs = 0, woffs = ops->ooboffs; |
2124 | size_t bytes = 0; | 2124 | size_t bytes = 0; |
@@ -2167,7 +2167,7 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to, | |||
2167 | uint32_t writelen = ops->len; | 2167 | uint32_t writelen = ops->len; |
2168 | 2168 | ||
2169 | uint32_t oobwritelen = ops->ooblen; | 2169 | uint32_t oobwritelen = ops->ooblen; |
2170 | uint32_t oobmaxlen = ops->mode == MTD_OOB_AUTO ? | 2170 | uint32_t oobmaxlen = ops->mode == MTD_OPS_AUTO_OOB ? |
2171 | mtd->oobavail : mtd->oobsize; | 2171 | mtd->oobavail : mtd->oobsize; |
2172 | 2172 | ||
2173 | uint8_t *oob = ops->oobbuf; | 2173 | uint8_t *oob = ops->oobbuf; |
@@ -2236,7 +2236,7 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to, | |||
2236 | } | 2236 | } |
2237 | 2237 | ||
2238 | ret = chip->write_page(mtd, chip, wbuf, page, cached, | 2238 | ret = chip->write_page(mtd, chip, wbuf, page, cached, |
2239 | (ops->mode == MTD_OOB_RAW)); | 2239 | (ops->mode == MTD_OPS_RAW)); |
2240 | if (ret) | 2240 | if (ret) |
2241 | break; | 2241 | break; |
2242 | 2242 | ||
@@ -2356,7 +2356,7 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to, | |||
2356 | pr_debug("%s: to = 0x%08x, len = %i\n", | 2356 | pr_debug("%s: to = 0x%08x, len = %i\n", |
2357 | __func__, (unsigned int)to, (int)ops->ooblen); | 2357 | __func__, (unsigned int)to, (int)ops->ooblen); |
2358 | 2358 | ||
2359 | if (ops->mode == MTD_OOB_AUTO) | 2359 | if (ops->mode == MTD_OPS_AUTO_OOB) |
2360 | len = chip->ecc.layout->oobavail; | 2360 | len = chip->ecc.layout->oobavail; |
2361 | else | 2361 | else |
2362 | len = mtd->oobsize; | 2362 | len = mtd->oobsize; |
@@ -2408,7 +2408,7 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to, | |||
2408 | 2408 | ||
2409 | nand_fill_oob(mtd, ops->oobbuf, ops->ooblen, ops); | 2409 | nand_fill_oob(mtd, ops->oobbuf, ops->ooblen, ops); |
2410 | 2410 | ||
2411 | if (ops->mode == MTD_OOB_RAW) | 2411 | if (ops->mode == MTD_OPS_RAW) |
2412 | status = chip->ecc.write_oob_raw(mtd, chip, page & chip->pagemask); | 2412 | status = chip->ecc.write_oob_raw(mtd, chip, page & chip->pagemask); |
2413 | else | 2413 | else |
2414 | status = chip->ecc.write_oob(mtd, chip, page & chip->pagemask); | 2414 | status = chip->ecc.write_oob(mtd, chip, page & chip->pagemask); |
@@ -2445,9 +2445,9 @@ static int nand_write_oob(struct mtd_info *mtd, loff_t to, | |||
2445 | nand_get_device(chip, mtd, FL_WRITING); | 2445 | nand_get_device(chip, mtd, FL_WRITING); |
2446 | 2446 | ||
2447 | switch (ops->mode) { | 2447 | switch (ops->mode) { |
2448 | case MTD_OOB_PLACE: | 2448 | case MTD_OPS_PLACE_OOB: |
2449 | case MTD_OOB_AUTO: | 2449 | case MTD_OPS_AUTO_OOB: |
2450 | case MTD_OOB_RAW: | 2450 | case MTD_OPS_RAW: |
2451 | break; | 2451 | break; |
2452 | 2452 | ||
2453 | default: | 2453 | default: |
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index 6aa8125772b..c488bcb84c9 100644 --- a/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c | |||
@@ -302,7 +302,7 @@ static int scan_read_raw_oob(struct mtd_info *mtd, uint8_t *buf, loff_t offs, | |||
302 | struct mtd_oob_ops ops; | 302 | struct mtd_oob_ops ops; |
303 | int res; | 303 | int res; |
304 | 304 | ||
305 | ops.mode = MTD_OOB_RAW; | 305 | ops.mode = MTD_OPS_RAW; |
306 | ops.ooboffs = 0; | 306 | ops.ooboffs = 0; |
307 | ops.ooblen = mtd->oobsize; | 307 | ops.ooblen = mtd->oobsize; |
308 | 308 | ||
@@ -350,7 +350,7 @@ static int scan_write_bbt(struct mtd_info *mtd, loff_t offs, size_t len, | |||
350 | { | 350 | { |
351 | struct mtd_oob_ops ops; | 351 | struct mtd_oob_ops ops; |
352 | 352 | ||
353 | ops.mode = MTD_OOB_PLACE; | 353 | ops.mode = MTD_OPS_PLACE_OOB; |
354 | ops.ooboffs = 0; | 354 | ops.ooboffs = 0; |
355 | ops.ooblen = mtd->oobsize; | 355 | ops.ooblen = mtd->oobsize; |
356 | ops.datbuf = buf; | 356 | ops.datbuf = buf; |
@@ -433,7 +433,7 @@ static int scan_block_fast(struct mtd_info *mtd, struct nand_bbt_descr *bd, | |||
433 | ops.oobbuf = buf; | 433 | ops.oobbuf = buf; |
434 | ops.ooboffs = 0; | 434 | ops.ooboffs = 0; |
435 | ops.datbuf = NULL; | 435 | ops.datbuf = NULL; |
436 | ops.mode = MTD_OOB_PLACE; | 436 | ops.mode = MTD_OPS_PLACE_OOB; |
437 | 437 | ||
438 | for (j = 0; j < len; j++) { | 438 | for (j = 0; j < len; j++) { |
439 | /* | 439 | /* |
@@ -672,7 +672,7 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf, | |||
672 | ops.ooblen = mtd->oobsize; | 672 | ops.ooblen = mtd->oobsize; |
673 | ops.ooboffs = 0; | 673 | ops.ooboffs = 0; |
674 | ops.datbuf = NULL; | 674 | ops.datbuf = NULL; |
675 | ops.mode = MTD_OOB_PLACE; | 675 | ops.mode = MTD_OPS_PLACE_OOB; |
676 | 676 | ||
677 | if (!rcode) | 677 | if (!rcode) |
678 | rcode = 0xff; | 678 | rcode = 0xff; |
diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c index b6332e83b28..2c438ef53cf 100644 --- a/drivers/mtd/nand/sm_common.c +++ b/drivers/mtd/nand/sm_common.c | |||
@@ -47,7 +47,7 @@ static int sm_block_markbad(struct mtd_info *mtd, loff_t ofs) | |||
47 | 47 | ||
48 | /* As long as this function is called on erase block boundaries | 48 | /* As long as this function is called on erase block boundaries |
49 | it will work correctly for 256 byte nand */ | 49 | it will work correctly for 256 byte nand */ |
50 | ops.mode = MTD_OOB_PLACE; | 50 | ops.mode = MTD_OPS_PLACE_OOB; |
51 | ops.ooboffs = 0; | 51 | ops.ooboffs = 0; |
52 | ops.ooblen = mtd->oobsize; | 52 | ops.ooblen = mtd->oobsize; |
53 | ops.oobbuf = (void *)&oob; | 53 | ops.oobbuf = (void *)&oob; |