mtd: gpmi: remove line breaks from error messages and improve wording

[karo-tx-linux.git] / drivers / mtd / nand / gpmi-nand / gpmi-nand.c

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index f638cd8077ca4e3aa3f5f626553a2fdf75d15736..16a533a78edd06be1df4f3f2312a2f77d8d34fd7 100644 (file)
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -285,9 +285,8 @@ static int legacy_set_geometry(struct gpmi_nand_data *this)
        geo->ecc_strength = get_ecc_strength(this);
        if (!gpmi_check_ecc(this)) {
                dev_err(this->dev,
-                       "We can not support this nand chip."
-                       " Its required ecc strength(%d) is beyond our"
-                       " capability(%d).\n", geo->ecc_strength,
+                       "required ecc strength of the NAND chip: %d is not supported by the GPMI controller (%d)\n",
+                       geo->ecc_strength,
                        this->devdata->bch_max_ecc_strength);
                return -EINVAL;
        }
@@ -1180,7 +1179,7 @@ static int gpmi_ecc_write_page(struct mtd_info *mtd, struct nand_chip *chip,
 
                /* Handle block mark swapping. */
                block_mark_swapping(this,
-                               (void *) payload_virt, (void *) auxiliary_virt);
+                               (void *)payload_virt, (void *)auxiliary_virt);
        } else {
                /*
                 * If control arrives here, we're not doing block mark swapping,
@@ -1597,8 +1596,9 @@ static int mx23_boot_init(struct gpmi_nand_data  *this)
                        dev_dbg(dev, "Transcribing mark in block %u\n", block);
                        ret = chip->block_markbad(mtd, byte);
                        if (ret)
-                               dev_err(dev, "Failed to mark block bad with "
-                                                       "ret %d\n", ret);
+                               dev_err(dev,
+                                       "Failed to mark block bad with ret %d\n",
+                                       ret);
                }
        }
 
@@ -1760,16 +1760,16 @@ err_out:
 static const struct of_device_id gpmi_nand_id_table[] = {
        {
                .compatible = "fsl,imx23-gpmi-nand",
-               .data = (void *)&gpmi_devdata_imx23,
+               .data = &gpmi_devdata_imx23,
        }, {
                .compatible = "fsl,imx28-gpmi-nand",
-               .data = (void *)&gpmi_devdata_imx28,
+               .data = &gpmi_devdata_imx28,
        }, {
                .compatible = "fsl,imx6q-gpmi-nand",
-               .data = (void *)&gpmi_devdata_imx6q,
+               .data = &gpmi_devdata_imx6q,
        }, {
                .compatible = "fsl,imx6sx-gpmi-nand",
-               .data = (void *)&gpmi_devdata_imx6sx,
+               .data = &gpmi_devdata_imx6sx,
        }, {}
 };
 MODULE_DEVICE_TABLE(of, gpmi_nand_id_table);