aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/mxc_nand.c
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2011-07-19 13:06:09 -0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 08:02:16 -0400
commit289c05222172b51401dbbb017115655f241d94ab (patch)
tree1fd2c801102a8c4a085f75a08c766d3250491962 /drivers/mtd/nand/mxc_nand.c
parentd037021953922ebdbc34b98b8c4648017b1c6e89 (diff)
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>
Diffstat (limited to 'drivers/mtd/nand/mxc_nand.c')
-rw-r--r--drivers/mtd/nand/mxc_nand.c14
1 files changed, 6 insertions, 8 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)
349 udelay(1); 349 udelay(1);
350 } 350 }
351 if (max_retries < 0) 351 if (max_retries < 0)
352 DEBUG(MTD_DEBUG_LEVEL0, "%s: INT not set\n", 352 pr_debug("%s: INT not set\n",
353 __func__); 353 __func__);
354 } 354 }
355} 355}
@@ -370,7 +370,7 @@ static void send_cmd_v3(struct mxc_nand_host *host, uint16_t cmd, int useirq)
370 * waits for completion. */ 370 * waits for completion. */
371static void send_cmd_v1_v2(struct mxc_nand_host *host, uint16_t cmd, int useirq) 371static void send_cmd_v1_v2(struct mxc_nand_host *host, uint16_t cmd, int useirq)
372{ 372{
373 DEBUG(MTD_DEBUG_LEVEL3, "send_cmd(host, 0x%x, %d)\n", cmd, useirq); 373 pr_debug("send_cmd(host, 0x%x, %d)\n", cmd, useirq);
374 374
375 writew(cmd, NFC_V1_V2_FLASH_CMD); 375 writew(cmd, NFC_V1_V2_FLASH_CMD);
376 writew(NFC_CMD, NFC_V1_V2_CONFIG2); 376 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)
386 udelay(1); 386 udelay(1);
387 } 387 }
388 if (max_retries < 0) 388 if (max_retries < 0)
389 DEBUG(MTD_DEBUG_LEVEL0, "%s: RESET failed\n", 389 pr_debug("%s: RESET failed\n",
390 __func__); 390 __func__);
391 } else { 391 } else {
392 /* Wait for operation to complete */ 392 /* Wait for operation to complete */
@@ -410,7 +410,7 @@ static void send_addr_v3(struct mxc_nand_host *host, uint16_t addr, int islast)
410 * a NAND command. */ 410 * a NAND command. */
411static void send_addr_v1_v2(struct mxc_nand_host *host, uint16_t addr, int islast) 411static void send_addr_v1_v2(struct mxc_nand_host *host, uint16_t addr, int islast)
412{ 412{
413 DEBUG(MTD_DEBUG_LEVEL3, "send_addr(host, 0x%x %d)\n", addr, islast); 413 pr_debug("send_addr(host, 0x%x %d)\n", addr, islast);
414 414
415 writew(addr, NFC_V1_V2_FLASH_ADDR); 415 writew(addr, NFC_V1_V2_FLASH_ADDR);
416 writew(NFC_ADDR, NFC_V1_V2_CONFIG2); 416 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,
560 uint16_t ecc_status = readw(NFC_V1_V2_ECC_STATUS_RESULT); 560 uint16_t ecc_status = readw(NFC_V1_V2_ECC_STATUS_RESULT);
561 561
562 if (((ecc_status & 0x3) == 2) || ((ecc_status >> 2) == 2)) { 562 if (((ecc_status & 0x3) == 2) || ((ecc_status >> 2) == 2)) {
563 DEBUG(MTD_DEBUG_LEVEL0, 563 pr_debug("MXC_NAND: HWECC uncorrectable 2-bit ECC error\n");
564 "MXC_NAND: HWECC uncorrectable 2-bit ECC error\n");
565 return -1; 564 return -1;
566 } 565 }
567 566
@@ -931,8 +930,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
931 struct nand_chip *nand_chip = mtd->priv; 930 struct nand_chip *nand_chip = mtd->priv;
932 struct mxc_nand_host *host = nand_chip->priv; 931 struct mxc_nand_host *host = nand_chip->priv;
933 932
934 DEBUG(MTD_DEBUG_LEVEL3, 933 pr_debug("mxc_nand_command (cmd = 0x%x, col = 0x%x, page = 0x%x)\n",
935 "mxc_nand_command (cmd = 0x%x, col = 0x%x, page = 0x%x)\n",
936 command, column, page_addr); 934 command, column, page_addr);
937 935
938 /* Reset command state information */ 936 /* Reset command state information */