mtd: rawnand: gpmi: Introduce GPMI_IS_MXS() macro

Introduce a GPMI_IS_MXS() macro to take into account the cases
when mx23 or mx28 are used, which helps readability.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c
index a4768df5083f9633a965bf85f12dce4b1d6ad35c..a8b26d2e793c21c3808a26ad857e7928c1915c4e 100644 (file)
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c
@@ -157,8 +157,7 @@ int gpmi_init(struct gpmi_nand_data *this)
         * Reset BCH here, too. We got failures otherwise :(
         * See later BCH reset for explanation of MX23 and MX28 handling
         */
-       ret = gpmi_reset_block(r->bch_regs,
-                              GPMI_IS_MX23(this) || GPMI_IS_MX28(this));
+       ret = gpmi_reset_block(r->bch_regs, GPMI_IS_MXS(this));
        if (ret)
                goto err_out;
 
@@ -266,8 +265,7 @@ int bch_set_geometry(struct gpmi_nand_data *this)
        * chip, otherwise it will lock up. So we skip resetting BCH on the MX23.
        * and MX28.
        */
-       ret = gpmi_reset_block(r->bch_regs,
-                              GPMI_IS_MX23(this) || GPMI_IS_MX28(this));
+       ret = gpmi_reset_block(r->bch_regs, GPMI_IS_MXS(this));
        if (ret)
                goto err_out;
 

diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
index ed405c9434fe531a4e961119388dafeb4922b59d..bcf5328cf23957667238a5704fe37cc9b924d0d3 100644 (file)
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
@@ -171,7 +171,7 @@ static inline bool gpmi_check_ecc(struct gpmi_nand_data *this)
        struct bch_geometry *geo = &this->bch_geometry;
 
        /* Do the sanity check. */
-       if (GPMI_IS_MX23(this) || GPMI_IS_MX28(this)) {
+       if (GPMI_IS_MXS(this)) {
                /* The mx23/mx28 only support the GF13. */
                if (geo->gf_len == 14)
                        return false;

diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
index d0b79bac2728072ff359a9137cdedac4fe13b67a..a804a4a5bd46a99a3fe7fe01cb6ccafc4038515c 100644 (file)
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
@@ -207,4 +207,5 @@ void gpmi_copy_bits(u8 *dst, size_t dst_bit_off,
 
 #define GPMI_IS_MX6(x)         (GPMI_IS_MX6Q(x) || GPMI_IS_MX6SX(x) || \
                                 GPMI_IS_MX7D(x))
+#define GPMI_IS_MXS(x)         (GPMI_IS_MX23(x) || GPMI_IS_MX28(x))
 #endif