Merge branch 'cleanup' into for-linus

[firefly-linux-kernel-4.4.55.git] / drivers / mtd / nand / nand_ecc.c

diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c
index b7cfe0d37121c8bdf78e5147f1cbed41c90b2f0c..053c9a2d47c3d02daca5589f622bb0e083c67afa 100644 (file)
--- a/drivers/mtd/nand/nand_ecc.c
+++ b/drivers/mtd/nand/nand_ecc.c
@@ -55,8 +55,7 @@ struct mtd_info;
 #define MODULE_AUTHOR(x)       /* x */
 #define MODULE_DESCRIPTION(x)  /* x */
 
-#define printk printf
-#define KERN_ERR               ""
+#define pr_err printf
 #endif
 
 /*
@@ -507,7 +506,7 @@ int __nand_correct_data(unsigned char *buf,
        if ((bitsperbyte[b0] + bitsperbyte[b1] + bitsperbyte[b2]) == 1)
                return 1;       /* error in ECC data; no action needed */
 
-       printk(KERN_ERR "uncorrectable error : ");
+       pr_err("%s: uncorrectable ECC error", __func__);
        return -1;
 }
 EXPORT_SYMBOL(__nand_correct_data);