mtd: rawnand: Replace printk() with appropriate pr_*() macro

Using pr_<loglevel>() is more concise than printk(KERN_<LOGLEVEL>).
Replace printks having a log level with the appropriate pr_*() macros.
Define pr_fmt() and remove other additional macros from the replaced
printks.

Signed-off-by: Shreeya Patel <shreeya.patel23498@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>

diff --git a/drivers/mtd/nand/raw/ams-delta.c b/drivers/mtd/nand/raw/ams-delta.c
index 35f8052..37a3cc2 100644 (file)
--- a/drivers/mtd/nand/raw/ams-delta.c
+++ b/drivers/mtd/nand/raw/ams-delta.c
@@ -186,7 +186,7 @@ static int ams_delta_init(struct platform_device *pdev)
        /* Allocate memory for MTD device structure and private data */
        this = kzalloc(sizeof(struct nand_chip), GFP_KERNEL);
        if (!this) {
-               printk (KERN_WARNING "Unable to allocate E3 NAND MTD device structure.\n");
+               pr_warn("Unable to allocate E3 NAND MTD device structure.\n");
                err = -ENOMEM;
                goto out;
        }
@@ -220,7 +220,7 @@ static int ams_delta_init(struct platform_device *pdev)
                this->dev_ready = ams_delta_nand_ready;
        } else {
                this->dev_ready = NULL;
-               printk(KERN_NOTICE "Couldn't request gpio for Delta NAND ready.\n");
+               pr_notice("Couldn't request gpio for Delta NAND ready.\n");
        }
        /* 25 us command delay time */
        this->chip_delay = 30;

diff --git a/drivers/mtd/nand/raw/cafe_nand.c b/drivers/mtd/nand/raw/cafe_nand.c
index 567ff97..37cfae2 100644 (file)
--- a/drivers/mtd/nand/raw/cafe_nand.c
+++ b/drivers/mtd/nand/raw/cafe_nand.c
@@ -751,8 +751,8 @@ static int cafe_nand_probe(struct pci_dev *pdev,
                cafe->nand.bbt_td = &cafe_bbt_main_descr_512;
                cafe->nand.bbt_md = &cafe_bbt_mirror_descr_512;
        } else {
-               printk(KERN_WARNING "Unexpected NAND flash writesize %d. Aborting\n",
-                      mtd->writesize);
+               pr_warn("Unexpected NAND flash writesize %d. Aborting\n",
+                       mtd->writesize);
                goto out_free_dma;
        }
        cafe->nand.ecc.mode = NAND_ECC_HW_SYNDROME;

diff --git a/drivers/mtd/nand/raw/cs553x_nand.c b/drivers/mtd/nand/raw/cs553x_nand.c
index be1f28f..82269fd 100644 (file)
--- a/drivers/mtd/nand/raw/cs553x_nand.c
+++ b/drivers/mtd/nand/raw/cs553x_nand.c
@@ -187,10 +187,11 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr)
        struct nand_chip *this;
        struct mtd_info *new_mtd;
 
-       printk(KERN_NOTICE "Probing CS553x NAND controller CS#%d at %sIO 0x%08lx\n", cs, mmio?"MM":"P", adr);
+       pr_notice("Probing CS553x NAND controller CS#%d at %sIO 0x%08lx\n",
+                 cs, mmio ? "MM" : "P", adr);
 
        if (!mmio) {
-               printk(KERN_NOTICE "PIO mode not yet implemented for CS553X NAND controller\n");
+               pr_notice("PIO mode not yet implemented for CS553X NAND controller\n");
                return -ENXIO;
        }
 
@@ -209,7 +210,7 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr)
        /* map physical address */
        this->IO_ADDR_R = this->IO_ADDR_W = ioremap(adr, 4096);
        if (!this->IO_ADDR_R) {
-               printk(KERN_WARNING "ioremap cs553x NAND @0x%08lx failed\n", adr);
+               pr_warn("ioremap cs553x NAND @0x%08lx failed\n", adr);
                err = -EIO;
                goto out_mtd;
        }
@@ -293,7 +294,7 @@ static int __init cs553x_init(void)
        /* If it doesn't have the NAND controller enabled, abort */
        rdmsrl(MSR_DIVIL_BALL_OPTS, val);
        if (val & PIN_OPT_IDE) {
-               printk(KERN_INFO "CS553x NAND controller: Flash I/O not enabled in MSR_DIVIL_BALL_OPTS.\n");
+               pr_info("CS553x NAND controller: Flash I/O not enabled in MSR_DIVIL_BALL_OPTS.\n");
                return -ENXIO;
        }
 

diff --git a/drivers/mtd/nand/raw/diskonchip.c b/drivers/mtd/nand/raw/diskonchip.c
index 1af77f7..86a258d 100644 (file)
--- a/drivers/mtd/nand/raw/diskonchip.c
+++ b/drivers/mtd/nand/raw/diskonchip.c
@@ -409,7 +409,7 @@ static uint16_t __init doc200x_ident_chip(struct mtd_info *mtd, int nr)
 
                ident.dword = readl(docptr + DoC_2k_CDSN_IO);
                if (((ident.byte[0] << 8) | ident.byte[1]) == ret) {
-                       printk(KERN_INFO "DiskOnChip 2000 responds to DWORD access\n");
+                       pr_info("DiskOnChip 2000 responds to DWORD access\n");
                        this->read_buf = &doc2000_readbuf_dword;
                }
        }
@@ -436,7 +436,7 @@ static void __init doc2000_count_chips(struct mtd_info *mtd)
                        break;
        }
        doc->chips_per_floor = i;
-       printk(KERN_DEBUG "Detected %d chips per floor.\n", i);
+       pr_debug("Detected %d chips per floor.\n", i);
 }
 
 static int doc200x_wait(struct mtd_info *mtd, struct nand_chip *this)
@@ -932,14 +932,15 @@ static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat,
 
                ret = doc_ecc_decode(rs_decoder, dat, calc_ecc);
                if (ret > 0)
-                       printk(KERN_ERR "doc200x_correct_data corrected %d errors\n", ret);
+                       pr_err("doc200x_correct_data corrected %d errors\n",
+                              ret);
        }
        if (DoC_is_MillenniumPlus(doc))
                WriteDOC(DOC_ECC_DIS, docptr, Mplus_ECCConf);
        else
                WriteDOC(DOC_ECC_DIS, docptr, ECCConf);
        if (no_ecc_failures && mtd_is_eccerr(ret)) {
-               printk(KERN_ERR "suppressing ECC failure\n");
+               pr_err("suppressing ECC failure\n");
                ret = 0;
        }
        return ret;
@@ -1012,11 +1013,11 @@ static int __init find_media_headers(struct mtd_info *mtd, u_char *buf, const ch
                if (retlen != mtd->writesize)
                        continue;
                if (ret) {
-                       printk(KERN_WARNING "ECC error scanning DOC at 0x%x\n", offs);
+                       pr_warn("ECC error scanning DOC at 0x%x\n", offs);
                }
                if (memcmp(buf, id, 6))
                        continue;
-               printk(KERN_INFO "Found DiskOnChip %s Media Header at 0x%x\n", id, offs);
+               pr_info("Found DiskOnChip %s Media Header at 0x%x\n", id, offs);
                if (doc->mh0_page == -1) {
                        doc->mh0_page = offs >> this->page_shift;
                        if (!findmirror)
@@ -1027,7 +1028,7 @@ static int __init find_media_headers(struct mtd_info *mtd, u_char *buf, const ch
                return 2;
        }
        if (doc->mh0_page == -1) {
-               printk(KERN_WARNING "DiskOnChip %s Media Header not found.\n", id);
+               pr_warn("DiskOnChip %s Media Header not found.\n", id);
                return 0;
        }
        /* Only one mediaheader was found.  We want buf to contain a
@@ -1036,7 +1037,7 @@ static int __init find_media_headers(struct mtd_info *mtd, u_char *buf, const ch
        ret = mtd_read(mtd, offs, mtd->writesize, &retlen, buf);
        if (retlen != mtd->writesize) {
                /* Insanity.  Give up. */
-               printk(KERN_ERR "Read DiskOnChip Media Header once, but can't reread it???\n");
+               pr_err("Read DiskOnChip Media Header once, but can't reread it???\n");
                return 0;
        }
        return 1;
@@ -1066,11 +1067,11 @@ static inline int __init nftl_partscan(struct mtd_info *mtd, struct mtd_partitio
        le16_to_cpus(&mh->FirstPhysicalEUN);
        le32_to_cpus(&mh->FormattedSize);
 
-       printk(KERN_INFO "    DataOrgID        = %s\n"
-                        "    NumEraseUnits    = %d\n"
-                        "    FirstPhysicalEUN = %d\n"
-                        "    FormattedSize    = %d\n"
-                        "    UnitSizeFactor   = %d\n",
+       pr_info("    DataOrgID        = %s\n"
+               "    NumEraseUnits    = %d\n"
+               "    FirstPhysicalEUN = %d\n"
+               "    FormattedSize    = %d\n"
+               "    UnitSizeFactor   = %d\n",
                mh->DataOrgID, mh->NumEraseUnits,
                mh->FirstPhysicalEUN, mh->FormattedSize,
                mh->UnitSizeFactor);
@@ -1090,7 +1091,7 @@ static inline int __init nftl_partscan(struct mtd_info *mtd, struct mtd_partitio
                        maxblocks = min(32768U, (maxblocks << 1) + psize);
                        mh->UnitSizeFactor--;
                }
-               printk(KERN_WARNING "UnitSizeFactor=0x00 detected.  Correct value is assumed to be 0x%02x.\n", mh->UnitSizeFactor);
+               pr_warn("UnitSizeFactor=0x00 detected.  Correct value is assumed to be 0x%02x.\n", mh->UnitSizeFactor);
        }
 
        /* NOTE: The lines below modify internal variables of the NAND and MTD
@@ -1101,13 +1102,13 @@ static inline int __init nftl_partscan(struct mtd_info *mtd, struct mtd_partitio
        if (mh->UnitSizeFactor != 0xff) {
                this->bbt_erase_shift += (0xff - mh->UnitSizeFactor);
                mtd->erasesize <<= (0xff - mh->UnitSizeFactor);
-               printk(KERN_INFO "Setting virtual erase size to %d\n", mtd->erasesize);
+               pr_info("Setting virtual erase size to %d\n", mtd->erasesize);
                blocks = mtd->size >> this->bbt_erase_shift;
                maxblocks = min(32768U, mtd->erasesize - psize);
        }
 
        if (blocks > maxblocks) {
-               printk(KERN_ERR "UnitSizeFactor of 0x%02x is inconsistent with device size.  Aborting.\n", mh->UnitSizeFactor);
+               pr_err("UnitSizeFactor of 0x%02x is inconsistent with device size.  Aborting.\n", mh->UnitSizeFactor);
                goto out;
        }
 
@@ -1178,14 +1179,14 @@ static inline int __init inftl_partscan(struct mtd_info *mtd, struct mtd_partiti
        le32_to_cpus(&mh->FormatFlags);
        le32_to_cpus(&mh->PercentUsed);
 
-       printk(KERN_INFO "    bootRecordID          = %s\n"
-                        "    NoOfBootImageBlocks   = %d\n"
-                        "    NoOfBinaryPartitions  = %d\n"
-                        "    NoOfBDTLPartitions    = %d\n"
-                        "    BlockMultiplerBits    = %d\n"
-                        "    FormatFlgs            = %d\n"
-                        "    OsakVersion           = %d.%d.%d.%d\n"
-                        "    PercentUsed           = %d\n",
+       pr_info("    bootRecordID          = %s\n"
+               "    NoOfBootImageBlocks   = %d\n"
+               "    NoOfBinaryPartitions  = %d\n"
+               "    NoOfBDTLPartitions    = %d\n"
+               "    BlockMultiplerBits    = %d\n"
+               "    FormatFlgs            = %d\n"
+               "    OsakVersion           = %d.%d.%d.%d\n"
+               "    PercentUsed           = %d\n",
                mh->bootRecordID, mh->NoOfBootImageBlocks,
                mh->NoOfBinaryPartitions,
                mh->NoOfBDTLPartitions,
@@ -1200,13 +1201,13 @@ static inline int __init inftl_partscan(struct mtd_info *mtd, struct mtd_partiti
 
        blocks = mtd->size >> vshift;
        if (blocks > 32768) {
-               printk(KERN_ERR "BlockMultiplierBits=%d is inconsistent with device size.  Aborting.\n", mh->BlockMultiplierBits);
+               pr_err("BlockMultiplierBits=%d is inconsistent with device size.  Aborting.\n", mh->BlockMultiplierBits);
                goto out;
        }
 
        blocks = doc->chips_per_floor << (this->chip_shift - this->phys_erase_shift);
        if (inftl_bbt_write && (blocks > mtd->erasesize)) {
-               printk(KERN_ERR "Writeable BBTs spanning more than one erase block are not yet supported.  FIX ME!\n");
+               pr_err("Writeable BBTs spanning more than one erase block are not yet supported.  FIX ME!\n");
                goto out;
        }
 
@@ -1220,7 +1221,7 @@ static inline int __init inftl_partscan(struct mtd_info *mtd, struct mtd_partiti
                le32_to_cpus(&ip->spareUnits);
                le32_to_cpus(&ip->Reserved0);
 
-               printk(KERN_INFO        "    PARTITION[%d] ->\n"
+               pr_info("    PARTITION[%d] ->\n"
                        "        virtualUnits    = %d\n"
                        "        firstUnit       = %d\n"
                        "        lastUnit        = %d\n"
@@ -1306,7 +1307,7 @@ static int __init inftl_scan_bbt(struct mtd_info *mtd)
        struct mtd_partition parts[5];
 
        if (this->numchips > doc->chips_per_floor) {
-               printk(KERN_ERR "Multi-floor INFTL devices not yet supported.\n");
+               pr_err("Multi-floor INFTL devices not yet supported.\n");
                return -EIO;
        }
 
@@ -1434,7 +1435,8 @@ static int __init doc_probe(unsigned long physadr)
                return -EBUSY;
        virtadr = ioremap(physadr, DOC_IOREMAP_LEN);
        if (!virtadr) {
-               printk(KERN_ERR "Diskonchip ioremap failed: 0x%x bytes at 0x%lx\n", DOC_IOREMAP_LEN, physadr);
+               pr_err("Diskonchip ioremap failed: 0x%x bytes at 0x%lx\n",
+                      DOC_IOREMAP_LEN, physadr);
                ret = -EIO;
                goto error_ioremap;
        }
@@ -1493,7 +1495,7 @@ static int __init doc_probe(unsigned long physadr)
                        reg = DoC_Mplus_Toggle;
                        break;
                case DOC_ChipID_DocMilPlus32:
-                       printk(KERN_ERR "DiskOnChip Millennium Plus 32MB is not supported, ignoring.\n");
+                       pr_err("DiskOnChip Millennium Plus 32MB is not supported, ignoring.\n");
                default:
                        ret = -ENODEV;
                        goto notfound;
@@ -1509,7 +1511,7 @@ static int __init doc_probe(unsigned long physadr)
        tmpb = ReadDOC_(virtadr, reg) & DOC_TOGGLE_BIT;
        tmpc = ReadDOC_(virtadr, reg) & DOC_TOGGLE_BIT;
        if ((tmp == tmpb) || (tmp != tmpc)) {
-               printk(KERN_WARNING "Possible DiskOnChip at 0x%lx failed TOGGLE test, dropping.\n", physadr);
+               pr_warn("Possible DiskOnChip at 0x%lx failed TOGGLE test, dropping.\n", physadr);
                ret = -ENODEV;
                goto notfound;
        }
@@ -1543,12 +1545,13 @@ static int __init doc_probe(unsigned long physadr)
                }
                newval = ~newval;
                if (oldval == newval) {
-                       printk(KERN_DEBUG "Found alias of DOC at 0x%lx to 0x%lx\n", doc->physadr, physadr);
+                       pr_debug("Found alias of DOC at 0x%lx to 0x%lx\n",
+                                doc->physadr, physadr);
                        goto notfound;
                }
        }
 
-       printk(KERN_NOTICE "DiskOnChip found at 0x%lx\n", physadr);
+       pr_notice("DiskOnChip found at 0x%lx\n", physadr);
 
        len = sizeof(struct nand_chip) + sizeof(struct doc_priv) +
              (2 * sizeof(struct nand_bbt_descr));
@@ -1663,12 +1666,13 @@ static int __init init_nanddoc(void)
         */
        rs_decoder = init_rs(10, 0x409, FCR, 1, NROOTS);
        if (!rs_decoder) {
-               printk(KERN_ERR "DiskOnChip: Could not create a RS decoder\n");
+               pr_err("DiskOnChip: Could not create a RS decoder\n");
                return -ENOMEM;
        }
 
        if (doc_config_location) {
-               printk(KERN_INFO "Using configured DiskOnChip probe address 0x%lx\n", doc_config_location);
+               pr_info("Using configured DiskOnChip probe address 0x%lx\n",
+                       doc_config_location);
                ret = doc_probe(doc_config_location);
                if (ret < 0)
                        goto outerr;
@@ -1680,7 +1684,7 @@ static int __init init_nanddoc(void)
        /* No banner message any more. Print a message if no DiskOnChip
           found, so the user knows we at least tried. */
        if (!doclist) {
-               printk(KERN_INFO "No valid DiskOnChip devices found\n");
+               pr_info("No valid DiskOnChip devices found\n");
                ret = -ENODEV;
                goto outerr;
        }

diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
index 8b6dcd7..84f7d6a 100644 (file)
--- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
@@ -929,8 +929,8 @@ static int fsl_elbc_nand_probe(struct platform_device *pdev)
        mtd_device_parse_register(mtd, part_probe_types, NULL,
                                  NULL, 0);
 
-       printk(KERN_INFO "eLBC NAND device at 0x%llx, bank %d\n",
-              (unsigned long long)res.start, priv->bank);
+       pr_info("eLBC NAND device at 0x%llx, bank %d\n",
+               (unsigned long long)res.start, priv->bank);
        return 0;
 
 err:

diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c
index 4872a7b..4f0bbc8 100644 (file)
--- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
@@ -805,7 +805,7 @@ static void fsl_ifc_sram_init(struct fsl_ifc_mtd *priv)
                           msecs_to_jiffies(IFC_TIMEOUT_MSECS));
 
        if (ctrl->nand_stat != IFC_NAND_EVTER_STAT_OPC)
-               printk(KERN_ERR "fsl-ifc: Failed to Initialise SRAM\n");
+               pr_err("fsl-ifc: Failed to Initialise SRAM\n");
 
        /* Restore CSOR and CSOR_ext */
        ifc_out32(csor, &ifc_global->csor_cs[cs].csor);

diff --git a/drivers/mtd/nand/raw/nand_bch.c b/drivers/mtd/nand/raw/nand_bch.c
index 505441c..7f11b68 100644 (file)
--- a/drivers/mtd/nand/raw/nand_bch.c
+++ b/drivers/mtd/nand/raw/nand_bch.c
@@ -95,7 +95,7 @@ int nand_bch_correct_data(struct mtd_info *mtd, unsigned char *buf,
                                        errloc[i]);
                }
        } else if (count < 0) {
-               printk(KERN_ERR "ecc unrecoverable error\n");
+               pr_err("ecc unrecoverable error\n");
                count = -EBADMSG;
        }
        return count;
@@ -134,7 +134,7 @@ struct nand_bch_control *nand_bch_init(struct mtd_info *mtd)
        }
 
        if (!eccsize || !eccbytes) {
-               printk(KERN_WARNING "ecc parameters not supplied\n");
+               pr_warn("ecc parameters not supplied\n");
                goto fail;
        }
 
@@ -151,8 +151,8 @@ struct nand_bch_control *nand_bch_init(struct mtd_info *mtd)
 
        /* verify that eccbytes has the expected value */
        if (nbc->bch->ecc_bytes != eccbytes) {
-               printk(KERN_WARNING "invalid eccbytes %u, should be %u\n",
-                      eccbytes, nbc->bch->ecc_bytes);
+               pr_warn("invalid eccbytes %u, should be %u\n",
+                       eccbytes, nbc->bch->ecc_bytes);
                goto fail;
        }
 
@@ -166,7 +166,7 @@ struct nand_bch_control *nand_bch_init(struct mtd_info *mtd)
 
        /* sanity checks */
        if (8*(eccsize+eccbytes) >= (1 << m)) {
-               printk(KERN_WARNING "eccsize %u is too large\n", eccsize);
+               pr_warn("eccsize %u is too large\n", eccsize);
                goto fail;
        }
 
@@ -181,7 +181,7 @@ struct nand_bch_control *nand_bch_init(struct mtd_info *mtd)
        nand->ecc.steps = eccsteps;
        nand->ecc.total = eccsteps * eccbytes;
        if (mtd_ooblayout_count_eccbytes(mtd) != (eccsteps*eccbytes)) {
-               printk(KERN_WARNING "invalid ecc layout\n");
+               pr_warn("invalid ecc layout\n");
                goto fail;
        }
 

diff --git a/drivers/mtd/nand/raw/nandsim.c b/drivers/mtd/nand/raw/nandsim.c
index 44322a3..e027c6f 100644 (file)
--- a/drivers/mtd/nand/raw/nandsim.c
+++ b/drivers/mtd/nand/raw/nandsim.c
@@ -23,6 +23,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
  */
 
+#define pr_fmt(fmt)  "[nandsim]" fmt
+
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/module.h>
@@ -179,20 +181,17 @@ MODULE_PARM_DESC(bch,              "Enable BCH ecc and set how many bits should "
 /* The largest possible page size */
 #define NS_LARGEST_PAGE_SIZE   4096
 
-/* The prefix for simulator output */
-#define NS_OUTPUT_PREFIX "[nandsim]"
-
 /* Simulator's output macros (logging, debugging, warning, error) */
 #define NS_LOG(args...) \
-       do { if (log) printk(KERN_DEBUG NS_OUTPUT_PREFIX " log: " args); } while(0)
+       do { if (log) pr_debug(" log: " args); } while(0)
 #define NS_DBG(args...) \
-       do { if (dbg) printk(KERN_DEBUG NS_OUTPUT_PREFIX " debug: " args); } while(0)
+       do { if (dbg) pr_debug(" debug: " args); } while(0)
 #define NS_WARN(args...) \
-       do { printk(KERN_WARNING NS_OUTPUT_PREFIX " warning: " args); } while(0)
+       do { pr_warn(" warning: " args); } while(0)
 #define NS_ERR(args...) \
-       do { printk(KERN_ERR NS_OUTPUT_PREFIX " error: " args); } while(0)
+       do { pr_err(" error: " args); } while(0)
 #define NS_INFO(args...) \
-       do { printk(KERN_INFO NS_OUTPUT_PREFIX " " args); } while(0)
+       do { pr_info(" " args); } while(0)
 
 /* Busy-wait delay macros (microseconds, milliseconds) */
 #define NS_UDELAY(us) \

diff --git a/drivers/mtd/nand/raw/r852.c b/drivers/mtd/nand/raw/r852.c
index 595635b..dcdeb06 100644 (file)
--- a/drivers/mtd/nand/raw/r852.c
+++ b/drivers/mtd/nand/raw/r852.c
@@ -7,6 +7,9 @@
  * published by the Free Software Foundation.
  */
 
+#define DRV_NAME "r852"
+#define pr_fmt(fmt)  DRV_NAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/jiffies.h>
@@ -932,7 +935,7 @@ static int  r852_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
                &dev->card_detect_work, 0);
 
 
-       printk(KERN_NOTICE DRV_NAME ": driver loaded successfully\n");
+       pr_notice("driver loaded successfully\n");
        return 0;
 
 error10:

diff --git a/drivers/mtd/nand/raw/r852.h b/drivers/mtd/nand/raw/r852.h
index 8713c57..1eed2fc 100644 (file)
--- a/drivers/mtd/nand/raw/r852.h
+++ b/drivers/mtd/nand/raw/r852.h
@@ -144,17 +144,14 @@ struct r852_device {
        uint8_t ctlreg;                 /* cached contents of control reg */
 };
 
-#define DRV_NAME "r852"
-
-
 #define dbg(format, ...) \
        if (debug) \
-               printk(KERN_DEBUG DRV_NAME ": " format "\n", ## __VA_ARGS__)
+               pr_debug(format "\n", ## __VA_ARGS__)
 
 #define dbg_verbose(format, ...) \
        if (debug > 1) \
-               printk(KERN_DEBUG DRV_NAME ": " format "\n", ## __VA_ARGS__)
+               pr_debug(format "\n", ## __VA_ARGS__)
 
 
 #define message(format, ...) \
-       printk(KERN_INFO DRV_NAME ": " format "\n", ## __VA_ARGS__)
+       pr_info(format "\n", ## __VA_ARGS__)

diff --git a/drivers/mtd/nand/raw/sh_flctl.c b/drivers/mtd/nand/raw/sh_flctl.c
index c4e7755..a60d43a 100644 (file)
--- a/drivers/mtd/nand/raw/sh_flctl.c
+++ b/drivers/mtd/nand/raw/sh_flctl.c
@@ -877,7 +877,7 @@ static void flctl_cmdfunc(struct mtd_info *mtd, unsigned int command,
                        else if (!flctl->seqin_column)
                                execmd_write_page_sector(mtd);
                        else
-                               printk(KERN_ERR "Invalid address !?\n");
+                               pr_err("Invalid address !?\n");
                        break;
                }
                set_cmd_regs(mtd, command, (command << 8) | NAND_CMD_SEQIN);

diff --git a/drivers/mtd/nand/raw/sm_common.c b/drivers/mtd/nand/raw/sm_common.c
index c378705..7f5044a 100644 (file)
--- a/drivers/mtd/nand/raw/sm_common.c
+++ b/drivers/mtd/nand/raw/sm_common.c
@@ -119,9 +119,8 @@ static int sm_block_markbad(struct mtd_info *mtd, loff_t ofs)
 
        ret = mtd_write_oob(mtd, ofs, &ops);
        if (ret < 0 || ops.oobretlen != SM_OOB_SIZE) {
-               printk(KERN_NOTICE
-                       "sm_common: can't mark sector at %i as bad\n",
-                                                               (int)ofs);
+               pr_notice("sm_common: can't mark sector at %i as bad\n",
+                         (int)ofs);
                return -EIO;
        }