mtd: replace DEBUG() with pr_debug()

Start moving away from the MTD_DEBUG_LEVEL messages. The dynamic
debugging feature is a generic kernel feature that provides more
flexibility.

(See Documentation/dynamic-debug-howto.txt)

Also fix some punctuation, indentation, and capitalization that went
along with the affected lines.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>

6 files changed, 51 insertions, 54 deletions

diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 4c2bb4a4bf0b..2fbfb71c237b 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -349,7 +349,7 @@ static void wait_op_done(struct mxc_nand_host *host, int useirq)
                         udelay(1);
                 }
                 if (max_retries < 0)
-                        DEBUG(MTD_DEBUG_LEVEL0, "%s: INT not set\n",
+                        pr_debug("%s: INT not set\n",
                               __func__);
         }
 }
@@ -370,7 +370,7 @@ static void send_cmd_v3(struct mxc_nand_host *host, uint16_t cmd, int useirq)
  * waits for completion. */
 static void send_cmd_v1_v2(struct mxc_nand_host *host, uint16_t cmd, int useirq)
 {
-        DEBUG(MTD_DEBUG_LEVEL3, "send_cmd(host, 0x%x, %d)\n", cmd, useirq);
+        pr_debug("send_cmd(host, 0x%x, %d)\n", cmd, useirq);
 
         writew(cmd, NFC_V1_V2_FLASH_CMD);
         writew(NFC_CMD, NFC_V1_V2_CONFIG2);
@@ -386,7 +386,7 @@ static void send_cmd_v1_v2(struct mxc_nand_host *host, uint16_t cmd, int useirq)
                         udelay(1);
                 }
                 if (max_retries < 0)
-                        DEBUG(MTD_DEBUG_LEVEL0, "%s: RESET failed\n",
+                        pr_debug("%s: RESET failed\n",
                               __func__);
         } else {
                 /* Wait for operation to complete */
@@ -410,7 +410,7 @@ static void send_addr_v3(struct mxc_nand_host *host, uint16_t addr, int islast)
  * a NAND command. */
 static void send_addr_v1_v2(struct mxc_nand_host *host, uint16_t addr, int islast)
 {
-        DEBUG(MTD_DEBUG_LEVEL3, "send_addr(host, 0x%x %d)\n", addr, islast);
+        pr_debug("send_addr(host, 0x%x %d)\n", addr, islast);
 
         writew(addr, NFC_V1_V2_FLASH_ADDR);
         writew(NFC_ADDR, NFC_V1_V2_CONFIG2);
@@ -560,8 +560,7 @@ static int mxc_nand_correct_data_v1(struct mtd_info *mtd, u_char *dat,
         uint16_t ecc_status = readw(NFC_V1_V2_ECC_STATUS_RESULT);
 
         if (((ecc_status & 0x3) == 2) || ((ecc_status >> 2) == 2)) {
-                DEBUG(MTD_DEBUG_LEVEL0,
-                      "MXC_NAND: HWECC uncorrectable 2-bit ECC error\n");
+                pr_debug("MXC_NAND: HWECC uncorrectable 2-bit ECC error\n");
                 return -1;
         }
 
@@ -931,8 +930,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
         struct nand_chip *nand_chip = mtd->priv;
         struct mxc_nand_host *host = nand_chip->priv;
 
-        DEBUG(MTD_DEBUG_LEVEL3,
-              "mxc_nand_command (cmd = 0x%x, col = 0x%x, page = 0x%x)\n",
+        pr_debug("mxc_nand_command (cmd = 0x%x, col = 0x%x, page = 0x%x)\n",
               command, column, page_addr);
 
         /* Reset command state information */
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 6a5271256245..7f2691f94322 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -113,21 +113,19 @@ static int check_offs_len(struct mtd_info *mtd,
 
         /* Start address must align on block boundary */
         if (ofs & ((1 << chip->phys_erase_shift) - 1)) {
-                DEBUG(MTD_DEBUG_LEVEL0, "%s: Unaligned address\n", __func__);
+                pr_debug("%s: unaligned address\n", __func__);
                 ret = -EINVAL;
         }
 
         /* Length must align on block boundary */
         if (len & ((1 << chip->phys_erase_shift) - 1)) {
-                DEBUG(MTD_DEBUG_LEVEL0, "%s: Length not block aligned\n",
-                                        __func__);
+                pr_debug("%s: length not block aligned\n", __func__);
                 ret = -EINVAL;
         }
 
         /* Do not allow past end of device */
         if (ofs + len > mtd->size) {
-                DEBUG(MTD_DEBUG_LEVEL0, "%s: Past end of device\n",
-                                        __func__);
+                pr_debug("%s: past end of device\n", __func__);
                 ret = -EINVAL;
         }
 
@@ -913,7 +911,7 @@ static int __nand_unlock(struct mtd_info *mtd, loff_t ofs,
         status = chip->waitfunc(mtd, chip);
         /* See if device thinks it succeeded */
         if (status & 0x01) {
-                DEBUG(MTD_DEBUG_LEVEL0, "%s: Error status = 0x%08x\n",
+                pr_debug("%s: error status = 0x%08x\n",
                                         __func__, status);
                 ret = -EIO;
         }
@@ -935,7 +933,7 @@ int nand_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
         int chipnr;
         struct nand_chip *chip = mtd->priv;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "%s: start = 0x%012llx, len = %llu\n",
+        pr_debug("%s: start = 0x%012llx, len = %llu\n",
                         __func__, (unsigned long long)ofs, len);
 
         if (check_offs_len(mtd, ofs, len))
@@ -954,7 +952,7 @@ int nand_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
 
         /* Check, if it is write protected */
         if (nand_check_wp(mtd)) {
-                DEBUG(MTD_DEBUG_LEVEL0, "%s: Device is write protected!!!\n",
+                pr_debug("%s: device is write protected!\n",
                                         __func__);
                 ret = -EIO;
                 goto out;
@@ -988,7 +986,7 @@ int nand_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
         int chipnr, status, page;
         struct nand_chip *chip = mtd->priv;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "%s: start = 0x%012llx, len = %llu\n",
+        pr_debug("%s: start = 0x%012llx, len = %llu\n",
                         __func__, (unsigned long long)ofs, len);
 
         if (check_offs_len(mtd, ofs, len))
@@ -1003,7 +1001,7 @@ int nand_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
 
         /* Check, if it is write protected */
         if (nand_check_wp(mtd)) {
-                DEBUG(MTD_DEBUG_LEVEL0, "%s: Device is write protected!!!\n",
+                pr_debug("%s: device is write protected!\n",
                                         __func__);
                 status = MTD_ERASE_FAILED;
                 ret = -EIO;
@@ -1018,7 +1016,7 @@ int nand_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
         status = chip->waitfunc(mtd, chip);
         /* See if device thinks it succeeded */
         if (status & 0x01) {
-                DEBUG(MTD_DEBUG_LEVEL0, "%s: Error status = 0x%08x\n",
+                pr_debug("%s: error status = 0x%08x\n",
                                         __func__, status);
                 ret = -EIO;
                 goto out;
@@ -1756,7 +1754,7 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
         int len;
         uint8_t *buf = ops->oobbuf;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "%s: from = 0x%08Lx, len = %i\n",
+        pr_debug("%s: from = 0x%08Lx, len = %i\n",
                         __func__, (unsigned long long)from, readlen);
 
         stats = mtd->ecc_stats;
@@ -1767,8 +1765,8 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
                 len = mtd->oobsize;
 
         if (unlikely(ops->ooboffs >= len)) {
-                DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt to start read "
-                                        "outside oob\n", __func__);
+                pr_debug("%s: attempt to start read outside oob\n",
+                                __func__);
                 return -EINVAL;
         }
 
@@ -1776,8 +1774,8 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
         if (unlikely(from >= mtd->size ||
                      ops->ooboffs + readlen > ((mtd->size >> chip->page_shift) -
                                         (from >> chip->page_shift)) * len)) {
-                DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt read beyond end "
-                                        "of device\n", __func__);
+                pr_debug("%s: attempt to read beyond end of device\n",
+                                __func__);
                 return -EINVAL;
         }
 
@@ -1856,8 +1854,8 @@ static int nand_read_oob(struct mtd_info *mtd, loff_t from,
 
         /* Do not allow reads past end of device */
         if (ops->datbuf && (from + ops->len) > mtd->size) {
-                DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt read "
-                                "beyond end of device\n", __func__);
+                pr_debug("%s: attempt to read beyond end of device\n",
+                                __func__);
                 return -EINVAL;
         }
 
@@ -2352,7 +2350,7 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
         int chipnr, page, status, len;
         struct nand_chip *chip = mtd->priv;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "%s: to = 0x%08x, len = %i\n",
+        pr_debug("%s: to = 0x%08x, len = %i\n",
                          __func__, (unsigned int)to, (int)ops->ooblen);
 
         if (ops->mode == MTD_OOB_AUTO)
@@ -2362,14 +2360,14 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
 
         /* Do not allow write past end of page */
         if ((ops->ooboffs + ops->ooblen) > len) {
-                DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt to write "
-                                "past end of page\n", __func__);
+                pr_debug("%s: attempt to write past end of page\n",
+                                __func__);
                 return -EINVAL;
         }
 
         if (unlikely(ops->ooboffs >= len)) {
-                DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt to start "
-                                "write outside oob\n", __func__);
+                pr_debug("%s: attempt to start write outside oob\n",
+                                __func__);
                 return -EINVAL;
         }
 
@@ -2378,8 +2376,8 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
                      ops->ooboffs + ops->ooblen >
                         ((mtd->size >> chip->page_shift) -
                          (to >> chip->page_shift)) * len)) {
-                DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt write beyond "
-                                "end of device\n", __func__);
+                pr_debug("%s: attempt to write beyond end of device\n",
+                                __func__);
                 return -EINVAL;
         }
 
@@ -2432,8 +2430,8 @@ static int nand_write_oob(struct mtd_info *mtd, loff_t to,
 
         /* Do not allow writes past end of device */
         if (ops->datbuf && (to + ops->len) > mtd->size) {
-                DEBUG(MTD_DEBUG_LEVEL0, "%s: Attempt write beyond "
-                                "end of device\n", __func__);
+                pr_debug("%s: attempt to write beyond end of device\n",
+                                __func__);
                 return -EINVAL;
         }
 
@@ -2522,9 +2520,9 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
         unsigned int bbt_masked_page = 0xffffffff;
         loff_t len;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "%s: start = 0x%012llx, len = %llu\n",
-                                __func__, (unsigned long long)instr->addr,
-                                (unsigned long long)instr->len);
+        pr_debug("%s: start = 0x%012llx, len = %llu\n",
+                        __func__, (unsigned long long)instr->addr,
+                        (unsigned long long)instr->len);
 
         if (check_offs_len(mtd, instr->addr, instr->len))
                 return -EINVAL;
@@ -2546,8 +2544,8 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
 
         /* Check, if it is write protected */
         if (nand_check_wp(mtd)) {
-                DEBUG(MTD_DEBUG_LEVEL0, "%s: Device is write protected!!!\n",
-                                        __func__);
+                pr_debug("%s: device is write protected!\n",
+                                __func__);
                 instr->state = MTD_ERASE_FAILED;
                 goto erase_exit;
         }
@@ -2598,8 +2596,8 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
 
                 /* See if block erase succeeded */
                 if (status & NAND_STATUS_FAIL) {
-                        DEBUG(MTD_DEBUG_LEVEL0, "%s: Failed erase, "
-                                        "page 0x%08x\n", __func__, page);
+                        pr_debug("%s: failed erase, page 0x%08x\n",
+                                        __func__, page);
                         instr->state = MTD_ERASE_FAILED;
                         instr->fail_addr =
                                 ((loff_t)page << chip->page_shift);
@@ -2659,9 +2657,9 @@ erase_exit:
                 if (!rewrite_bbt[chipnr])
                         continue;
                 /* Update the BBT for chip */
-                DEBUG(MTD_DEBUG_LEVEL0, "%s: nand_update_bbt "
-                        "(%d:0x%0llx 0x%0x)\n", __func__, chipnr,
-                        rewrite_bbt[chipnr], chip->bbt_td->pages[chipnr]);
+                pr_debug("%s: nand_update_bbt (%d:0x%0llx 0x%0x)\n",
+                                __func__, chipnr, rewrite_bbt[chipnr],
+                                chip->bbt_td->pages[chipnr]);
                 nand_update_bbt(mtd, rewrite_bbt[chipnr]);
         }
 
@@ -2679,7 +2677,7 @@ static void nand_sync(struct mtd_info *mtd)
 {
         struct nand_chip *chip = mtd->priv;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "%s: called\n", __func__);
+        pr_debug("%s: called\n", __func__);
 
         /* Grab the lock and see if the device is available */
         nand_get_device(chip, mtd, FL_SYNCING);
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index dba332327d4f..6aa8125772b8 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -1383,8 +1383,9 @@ int nand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt)
         block = (int)(offs >> (this->bbt_erase_shift - 1));
         res = (this->bbt[block >> 3] >> (block & 0x06)) & 0x03;
 
-        DEBUG(MTD_DEBUG_LEVEL2, "nand_isbad_bbt(): bbt info for offs 0x%08x: (block %d) 0x%02x\n",
-              (unsigned int)offs, block >> 1, res);
+        pr_debug("nand_isbad_bbt(): bbt info for offs 0x%08x: "
+                        "(block %d) 0x%02x\n",
+                        (unsigned int)offs, block >> 1, res);
 
         switch ((int)res) {
         case 0x00:
diff --git a/drivers/mtd/nand/nand_bch.c b/drivers/mtd/nand/nand_bch.c
index 0f931e757116..16cca9b99052 100644
--- a/drivers/mtd/nand/nand_bch.c
+++ b/drivers/mtd/nand/nand_bch.c
@@ -93,7 +93,7 @@ int nand_bch_correct_data(struct mtd_info *mtd, unsigned char *buf,
                                 buf[errloc[i] >> 3] ^= (1 << (errloc[i] & 7));
                         /* else error in ecc, no action needed */
 
-                        DEBUG(MTD_DEBUG_LEVEL0, "%s: corrected bitflip %u\n",
+                        pr_debug("%s: corrected bitflip %u\n",
                               __func__, errloc[i]);
                 }
         } else if (count < 0) {
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index c5e33fdcbc86..81e6bc0c9048 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -741,12 +741,12 @@ static int omap_compare_ecc(u8 *ecc_data1,	/* read from NAND memory */
 
         case 1:
                 /* Uncorrectable error */
-                DEBUG(MTD_DEBUG_LEVEL0, "ECC UNCORRECTED_ERROR 1\n");
+                pr_debug("ECC UNCORRECTED_ERROR 1\n");
                 return -1;
 
         case 11:
                 /* UN-Correctable error */
-                DEBUG(MTD_DEBUG_LEVEL0, "ECC UNCORRECTED_ERROR B\n");
+                pr_debug("ECC UNCORRECTED_ERROR B\n");
                 return -1;
 
         case 12:
@@ -763,7 +763,7 @@ static int omap_compare_ecc(u8 *ecc_data1,	/* read from NAND memory */
 
                 find_bit = (ecc_bit[5] << 2) + (ecc_bit[3] << 1) + ecc_bit[1];
 
-                DEBUG(MTD_DEBUG_LEVEL0, "Correcting single bit ECC error at "
+                pr_debug("Correcting single bit ECC error at "
                                 "offset: %d, bit: %d\n", find_byte, find_bit);
 
                 page_data[find_byte] ^= (1 << find_bit);
@@ -776,7 +776,7 @@ static int omap_compare_ecc(u8 *ecc_data1,	/* read from NAND memory */
                             ecc_data2[2] == 0)
                                 return 0;
                 }
-                DEBUG(MTD_DEBUG_LEVEL0, "UNCORRECTED_ERROR default\n");
+                pr_debug("UNCORRECTED_ERROR default\n");
                 return -1;
         }
 }
diff --git a/drivers/mtd/nand/rtc_from4.c b/drivers/mtd/nand/rtc_from4.c
index 33fe922b972c..f309addc2fa0 100644
--- a/drivers/mtd/nand/rtc_from4.c
+++ b/drivers/mtd/nand/rtc_from4.c
@@ -380,7 +380,7 @@ static int rtc_from4_correct_data(struct mtd_info *mtd, const u_char *buf, u_cha
         /* Let the library code do its magic. */
         res = decode_rs8(rs_decoder, (uint8_t *) buf, par, 512, syn, 0, NULL, 0xff, NULL);
         if (res > 0) {
-                DEBUG(MTD_DEBUG_LEVEL0, "rtc_from4_correct_data: " "ECC corrected %d errors on read\n", res);
+                pr_debug("rtc_from4_correct_data: " "ECC corrected %d errors on read\n", res);
         }
         return res;
 }