]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
mtd: rawnand: omap: Rename a macro
authorMiquel Raynal <miquel.raynal@bootlin.com>
Thu, 10 Jun 2021 13:49:03 +0000 (15:49 +0200)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Fri, 18 Jun 2021 07:45:21 +0000 (09:45 +0200)
The macro BADBLOCK_MARKER_LENGTH is pretty long and could be reduced to
BBM_LEN which is more handy to use in the code.

This is a purely cosmetic change and is only done to avoid further
change to contain 100+ char lines just because of this definition.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20210610134906.3503303-3-miquel.raynal@bootlin.com
drivers/mtd/nand/raw/omap2.c

index a36c4e7e5bc18feb4b3334fe7fe0ab0a9cce79e0..659ca8ab490ee2e56cc49b0c881fb96fecb9884f 100644 (file)
 #define BCH_ECC_SIZE0          0x0     /* ecc_size0 = 0, no oob protection */
 #define BCH_ECC_SIZE1          0x20    /* ecc_size1 = 32 */
 
-#define BADBLOCK_MARKER_LENGTH         2
+#define BBM_LEN                        2
 
 static u_char bch16_vector[] = {0xf5, 0x24, 0x1c, 0xd0, 0x61, 0xb3, 0xf1, 0x55,
                                0x2e, 0x2c, 0x86, 0xa3, 0xed, 0x36, 0x1b, 0x78,
@@ -1649,8 +1649,8 @@ static int omap_read_page_bch(struct nand_chip *chip, uint8_t *buf,
 
        /* Read oob bytes */
        nand_change_read_column_op(chip,
-                                  mtd->writesize + BADBLOCK_MARKER_LENGTH,
-                                  chip->oob_poi + BADBLOCK_MARKER_LENGTH,
+                                  mtd->writesize + BBM_LEN,
+                                  chip->oob_poi + BBM_LEN,
                                   chip->ecc.total, false);
 
        /* Calculate ecc bytes */
@@ -1820,7 +1820,7 @@ static int omap_ooblayout_ecc(struct mtd_info *mtd, int section,
 {
        struct omap_nand_info *info = mtd_to_omap(mtd);
        struct nand_chip *chip = &info->nand;
-       int off = BADBLOCK_MARKER_LENGTH;
+       int off = BBM_LEN;
 
        if (info->ecc_opt == OMAP_ECC_HAM1_CODE_HW &&
            !(chip->options & NAND_BUSWIDTH_16))
@@ -1840,7 +1840,7 @@ static int omap_ooblayout_free(struct mtd_info *mtd, int section,
 {
        struct omap_nand_info *info = mtd_to_omap(mtd);
        struct nand_chip *chip = &info->nand;
-       int off = BADBLOCK_MARKER_LENGTH;
+       int off = BBM_LEN;
 
        if (info->ecc_opt == OMAP_ECC_HAM1_CODE_HW &&
            !(chip->options & NAND_BUSWIDTH_16))
@@ -1870,7 +1870,7 @@ static int omap_sw_ooblayout_ecc(struct mtd_info *mtd, int section,
        struct nand_device *nand = mtd_to_nanddev(mtd);
        unsigned int nsteps = nanddev_get_ecc_nsteps(nand);
        unsigned int ecc_bytes = nanddev_get_ecc_bytes_per_step(nand);
-       int off = BADBLOCK_MARKER_LENGTH;
+       int off = BBM_LEN;
 
        if (section >= nsteps)
                return -ERANGE;
@@ -1891,7 +1891,7 @@ static int omap_sw_ooblayout_free(struct mtd_info *mtd, int section,
        struct nand_device *nand = mtd_to_nanddev(mtd);
        unsigned int nsteps = nanddev_get_ecc_nsteps(nand);
        unsigned int ecc_bytes = nanddev_get_ecc_bytes_per_step(nand);
-       int off = BADBLOCK_MARKER_LENGTH;
+       int off = BBM_LEN;
 
        if (section)
                return -ERANGE;
@@ -1920,7 +1920,7 @@ static int omap_nand_attach_chip(struct nand_chip *chip)
        struct mtd_info *mtd = nand_to_mtd(chip);
        struct omap_nand_info *info = mtd_to_omap(mtd);
        struct device *dev = &info->pdev->dev;
-       int min_oobbytes = BADBLOCK_MARKER_LENGTH;
+       int min_oobbytes = BBM_LEN;
        int elm_bch_strength = -1;
        int oobbytes_per_step;
        dma_cap_mask_t mask;