From patchwork Tue Oct 17 15:10:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 116125 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp5017461qgn; Tue, 17 Oct 2017 08:12:24 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBAi8OZV6gVL+3dsdpOycwn4ARKYXMPmMu9KBG71Nx8GZdlzJ9TbAlDdtf2qihh13mm+JiE X-Received: by 10.80.212.133 with SMTP id s5mr17901784edi.286.1508253144039; Tue, 17 Oct 2017 08:12:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508253144; cv=none; d=google.com; s=arc-20160816; b=O091EtIHShBb06WqGxKDTnzRKVr5uIoVV6WQBe0oKrzXbtC52V5THcXgX9YrcakJwg 90wDPqbpVXzOnsnvhQA8Swc8CRxj9OPnOBteEC9ZMD5bOmQPIORL0TgaNPzbl6GSh8Nm FTgphBOtOy2m02Js44ZEu+RHebBsJRZM73Z7DV3QQcJ6Ooau+l6QzOuT182WLyGFd1fk TkPervpPrpv/I7z83iKNILiJDIamC0OybQMCSaWhNb7X0BDL5BAeVHT8ADqd492lzq4G gnqMFSe4/vaiPrDvSqn08pxvZFSBBK7acQJgCRVYMrFyJWIfNP09BeEOC7V1L+BFp17B 5TLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:message-id:date:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=qNcBnMLvChTmlwmmAZdyiJagEFnq5qsFsSy80enjsjc=; b=Co3SjLa6C6Je3sAoIJApswky7ufZ9JvZGwXaztDauo3Vj2fwKjk8Oui1FoYbpasl7E 101795b6ztsk/0x0aaLPog4y3p6wxgxminyE+MVGKKvRqSwNeX2byP8w8vlGyRNBCeog LDHGfM+UCmzgML11RvR20dN0bOtR0lQMYFac8tMidnKv9C0+ihxwDCAgdGyJ9bo8q1PN MwwAw2TkThf5Q3Wc7dn2J6YnahD0pBSSOutOdQ72SR/RTqxMSRM4277p0kXO8earUtO7 11/MoTn021ZEgeW2Vpvv/dDYE5SSW91euXQ/O2lK5W5tPIPSbhqIXVS9Bus/gf5eApJO DtGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=uAmOzq+0; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id x2si2379794edx.227.2017.10.17.08.12.23; Tue, 17 Oct 2017 08:12:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=uAmOzq+0; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 95275C21D76; Tue, 17 Oct 2017 15:11:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 691F7C21DA1; Tue, 17 Oct 2017 15:11:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9135FC21C40; Tue, 17 Oct 2017 15:11:30 +0000 (UTC) Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by lists.denx.de (Postfix) with ESMTPS id 55625C21C29 for ; Tue, 17 Oct 2017 15:11:29 +0000 (UTC) Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-11.nifty.com with ESMTP id v9HFAtr5010414; Wed, 18 Oct 2017 00:10:55 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com v9HFAtr5010414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1508253055; bh=fVgGxolXyE/FY8Ifz/WqXM7fmQFSMrefyipK0JHIZfE=; h=From:To:Cc:Subject:Date:From; b=uAmOzq+02gbnFpM/W4jEk2JLcJTz5WIv7A14Ae/ZgBvAoFOxVLeuNz4dp09c4Sbea MmSgVEgEivB71ryMFIrUB8I0yJqlZD1OUJTnIonzWkOk3wxg54GE4r5ZsGMcUB/29K 6XmZHyhnRVGso/4FGl6zOUbTiGB4dpIgQgAKkSgZlCa1+d3Aei5tq14wHZs/k5MFRo 6o9KSYxrrNNibCQQxMdtjaWk77z5yFdxJVc/9ks72Gt55qHVoBfaJo7YoeP8kCpk2K 7QA8Yjtog4UP0SIQ7i8DCTPMcaiLKtOhZYJiTeCh3EcOt/sd7VrmAMGu6v4LN7OtXi UI3haNBKLxEGw== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Wed, 18 Oct 2017 00:10:48 +0900 Message-Id: <1508253049-4105-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Cc: Scott Wood Subject: [U-Boot] [PATCH 1/2] mtd: replace MTDDEBUG() with pr_debug() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" In old days, the MTD subsystem in Linux had debug facility like DEBUG(MTD_DEBUG_LEVEL1, ...). They were all replaced with pr_debug() until Linux 3.2. See Linux commit 289c05222172 ("mtd: replace DEBUG() with pr_debug()"). U-Boot still uses similar macros. Covert all of them for easier sync. Done with the help of Coccinelle. The semantic patch I used is as follows: // @@ expression e1, e2; @@ -MTDDEBUG(e1, e2) +pr_debug(e2) @@ expression e1, e2; @@ -MTDDEBUG(e1, e2, +pr_debug(e2, ...) // Signed-off-by: Masahiro Yamada --- drivers/mtd/nand/atmel_nand.c | 7 +++--- drivers/mtd/nand/davinci_nand.c | 7 +++--- drivers/mtd/nand/mxc_nand.c | 49 ++++++++++++++++---------------------- drivers/mtd/nand/nand_bch.c | 4 ++-- drivers/mtd/onenand/onenand_base.c | 38 +++++++++++++++-------------- drivers/mtd/onenand/onenand_bbt.c | 5 ++-- 6 files changed, 51 insertions(+), 59 deletions(-) diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 7c10bfe..65dd83e 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -702,7 +702,7 @@ static int pmecc_choose_ecc(struct atmel_nand_host *host, if (chip->onfi_version) { *cap = chip->ecc_strength_ds; *sector_size = chip->ecc_step_ds; - MTDDEBUG(MTD_DEBUG_LEVEL1, "ONFI params, minimum required ECC: %d bits in %d bytes\n", + pr_debug("ONFI params, minimum required ECC: %d bits in %d bytes\n", *cap, *sector_size); } @@ -863,9 +863,8 @@ static int atmel_pmecc_nand_init_params(struct nand_chip *nand, host->pmecc_index_table_offset = ATMEL_PMECC_INDEX_OFFSET_1024; #endif - MTDDEBUG(MTD_DEBUG_LEVEL1, - "Initialize PMECC params, cap: %d, sector: %d\n", - cap, sector_size); + pr_debug("Initialize PMECC params, cap: %d, sector: %d\n", + cap, sector_size); host->pmecc = (struct pmecc_regs __iomem *) ATMEL_BASE_PMECC; host->pmerrloc = (struct pmecc_errloc_regs __iomem *) diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index 0624644..2a01fd3 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c @@ -238,7 +238,7 @@ static int nand_davinci_correct_data(struct mtd_info *mtd, u_char *dat, uint32_t find_byte = diff >> (12 + 3); dat[find_byte] ^= find_bit; - MTDDEBUG(MTD_DEBUG_LEVEL0, "Correcting single " + pr_debug("Correcting single " "bit ECC error at offset: %d, bit: " "%d\n", find_byte, find_bit); return 1; @@ -248,12 +248,11 @@ static int nand_davinci_correct_data(struct mtd_info *mtd, u_char *dat, } else if (!(diff & (diff - 1))) { /* Single bit ECC error in the ECC itself, nothing to fix */ - MTDDEBUG(MTD_DEBUG_LEVEL0, "Single bit ECC error in " - "ECC.\n"); + pr_debug("Single bit ECC error in " "ECC.\n"); return 1; } else { /* Uncorrectable error */ - MTDDEBUG(MTD_DEBUG_LEVEL0, "ECC UNCORRECTED_ERROR 1\n"); + pr_debug("ECC UNCORRECTED_ERROR 1\n"); return -EBADMSG; } } diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index 7221d0b..764391c 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c @@ -132,7 +132,7 @@ static void wait_op_done(struct mxc_nand_host *host, int max_retries, udelay(1); } if (max_retries < 0) { - MTDDEBUG(MTD_DEBUG_LEVEL0, "%s(%d): INT not set\n", + pr_debug("%s(%d): INT not set\n", __func__, param); } } @@ -143,7 +143,7 @@ static void wait_op_done(struct mxc_nand_host *host, int max_retries, */ static void send_cmd(struct mxc_nand_host *host, uint16_t cmd) { - MTDDEBUG(MTD_DEBUG_LEVEL3, "send_cmd(host, 0x%x)\n", cmd); + pr_debug("send_cmd(host, 0x%x)\n", cmd); writenfc(cmd, &host->regs->flash_cmd); writenfc(NFC_CMD, &host->regs->operation); @@ -159,7 +159,7 @@ static void send_cmd(struct mxc_nand_host *host, uint16_t cmd) */ static void send_addr(struct mxc_nand_host *host, uint16_t addr) { - MTDDEBUG(MTD_DEBUG_LEVEL3, "send_addr(host, 0x%x)\n", addr); + pr_debug("send_addr(host, 0x%x)\n", addr); writenfc(addr, &host->regs->flash_addr); writenfc(NFC_ADDR, &host->regs->operation); @@ -176,7 +176,7 @@ static void send_prog_page(struct mxc_nand_host *host, uint8_t buf_id, int spare_only) { if (spare_only) - MTDDEBUG(MTD_DEBUG_LEVEL1, "send_prog_page (%d)\n", spare_only); + pr_debug("send_prog_page (%d)\n", spare_only); if (is_mxc_nfc_21() || is_mxc_nfc_32()) { int i; @@ -226,7 +226,7 @@ static void send_prog_page(struct mxc_nand_host *host, uint8_t buf_id, static void send_read_page(struct mxc_nand_host *host, uint8_t buf_id, int spare_only) { - MTDDEBUG(MTD_DEBUG_LEVEL3, "send_read_page (%d)\n", spare_only); + pr_debug("send_read_page (%d)\n", spare_only); #if defined(MXC_NFC_V1) || defined(MXC_NFC_V2_1) writenfc(buf_id, &host->regs->buf_addr); @@ -392,8 +392,7 @@ static int mxc_nand_read_oob_syndrome(struct mtd_info *mtd, uint8_t *bufpoi = buf; int i, toread; - MTDDEBUG(MTD_DEBUG_LEVEL0, - "%s: Reading OOB area of page %u to oob %p\n", + pr_debug("%s: Reading OOB area of page %u to oob %p\n", __func__, page, buf); chip->cmdfunc(mtd, NAND_CMD_READOOB, mtd->writesize, page); @@ -493,8 +492,8 @@ static int mxc_nand_read_page_syndrome(struct mtd_info *mtd, uint8_t *p = buf; uint8_t *oob = chip->oob_poi; - MTDDEBUG(MTD_DEBUG_LEVEL1, "Reading page %u to buf %p oob %p\n", - page, buf, oob); + pr_debug("Reading page %u to buf %p oob %p\n", + page, buf, oob); /* first read the data area and the available portion of OOB */ for (n = 0; eccsteps; n++, eccsteps--, p += eccsize) { @@ -710,8 +709,7 @@ static int mxc_nand_correct_data(struct mtd_info *mtd, u_char *dat, uint16_t ecc_status = readnfc(&host->regs->ecc_status_result); if (((ecc_status & 0x3) == 2) || ((ecc_status >> 2) == 2)) { - MTDDEBUG(MTD_DEBUG_LEVEL0, - "MXC_NAND: HWECC uncorrectable 2-bit ECC error\n"); + pr_debug("MXC_NAND: HWECC uncorrectable 2-bit ECC error\n"); return -EBADMSG; } @@ -773,8 +771,7 @@ static uint16_t mxc_nand_read_word(struct mtd_info *mtd) uint16_t col, ret; uint16_t __iomem *p; - MTDDEBUG(MTD_DEBUG_LEVEL3, - "mxc_nand_read_word(col = %d)\n", host->col_addr); + pr_debug("mxc_nand_read_word(col = %d)\n", host->col_addr); col = host->col_addr; /* Adjust saved column address */ @@ -824,9 +821,8 @@ static void mxc_nand_write_buf(struct mtd_info *mtd, struct mxc_nand_host *host = nand_get_controller_data(nand_chip); int n, col, i = 0; - MTDDEBUG(MTD_DEBUG_LEVEL3, - "mxc_nand_write_buf(col = %d, len = %d)\n", host->col_addr, - len); + pr_debug("mxc_nand_write_buf(col = %d, len = %d)\n", host->col_addr, + len); col = host->col_addr; @@ -837,8 +833,7 @@ static void mxc_nand_write_buf(struct mtd_info *mtd, n = mtd->writesize + mtd->oobsize - col; n = min(len, n); - MTDDEBUG(MTD_DEBUG_LEVEL3, - "%s:%d: col = %d, n = %d\n", __func__, __LINE__, col, n); + pr_debug("%s:%d: col = %d, n = %d\n", __func__, __LINE__, col, n); while (n > 0) { void __iomem *p; @@ -850,8 +845,8 @@ static void mxc_nand_write_buf(struct mtd_info *mtd, mtd->writesize + (col & ~3); } - MTDDEBUG(MTD_DEBUG_LEVEL3, "%s:%d: p = %p\n", __func__, - __LINE__, p); + pr_debug("%s:%d: p = %p\n", __func__, + __LINE__, p); if (((col | (unsigned long)&buf[i]) & 3) || n < 4) { union { @@ -873,9 +868,8 @@ static void mxc_nand_write_buf(struct mtd_info *mtd, m = min(n, m) & ~3; - MTDDEBUG(MTD_DEBUG_LEVEL3, - "%s:%d: n = %d, m = %d, i = %d, col = %d\n", - __func__, __LINE__, n, m, i, col); + pr_debug("%s:%d: n = %d, m = %d, i = %d, col = %d\n", + __func__, __LINE__, n, m, i, col); mxc_nand_memcpy32(p, (uint32_t *)&buf[i], m); col += m; @@ -898,8 +892,8 @@ static void mxc_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len) struct mxc_nand_host *host = nand_get_controller_data(nand_chip); int n, col, i = 0; - MTDDEBUG(MTD_DEBUG_LEVEL3, - "mxc_nand_read_buf(col = %d, len = %d)\n", host->col_addr, len); + pr_debug("mxc_nand_read_buf(col = %d, len = %d)\n", host->col_addr, + len); col = host->col_addr; @@ -984,9 +978,8 @@ void mxc_nand_command(struct mtd_info *mtd, unsigned command, struct nand_chip *nand_chip = mtd_to_nand(mtd); struct mxc_nand_host *host = nand_get_controller_data(nand_chip); - MTDDEBUG(MTD_DEBUG_LEVEL3, - "mxc_nand_command (cmd = 0x%x, col = 0x%x, page = 0x%x)\n", - command, column, page_addr); + pr_debug("mxc_nand_command (cmd = 0x%x, col = 0x%x, page = 0x%x)\n", + command, column, page_addr); /* Reset command state information */ host->status_request = false; diff --git a/drivers/mtd/nand/nand_bch.c b/drivers/mtd/nand/nand_bch.c index c145203..6c20d53 100644 --- a/drivers/mtd/nand/nand_bch.c +++ b/drivers/mtd/nand/nand_bch.c @@ -81,8 +81,8 @@ 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 */ - MTDDEBUG(MTD_DEBUG_LEVEL0, "%s: corrected bitflip %u\n", - __func__, errloc[i]); + pr_debug("%s: corrected bitflip %u\n", + __func__, errloc[i]); } } else if (count < 0) { printk(KERN_ERR "ecc unrecoverable error\n"); diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index 8282f68..86b1640 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c @@ -858,7 +858,8 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from, int ret = 0, boundary = 0; int writesize = this->writesize; - MTDDEBUG(MTD_DEBUG_LEVEL3, "onenand_read_ops_nolock: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len); + pr_debug("onenand_read_ops_nolock: from = 0x%08x, len = %i\n", + (unsigned int) from, (int) len); if (ops->mode == MTD_OPS_AUTO_OOB) oobsize = this->ecclayout->oobavail; @@ -1007,7 +1008,8 @@ static int onenand_read_oob_nolock(struct mtd_info *mtd, loff_t from, from += ops->ooboffs; - MTDDEBUG(MTD_DEBUG_LEVEL3, "onenand_read_oob_nolock: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len); + pr_debug("onenand_read_oob_nolock: from = 0x%08x, len = %i\n", + (unsigned int) from, (int) len); /* Initialize return length value */ ops->oobretlen = 0; @@ -1214,7 +1216,8 @@ int onenand_bbt_read_oob(struct mtd_info *mtd, loff_t from, size_t len = ops->ooblen; u_char *buf = ops->oobbuf; - MTDDEBUG(MTD_DEBUG_LEVEL3, "onenand_bbt_read_oob: from = 0x%08x, len = %zi\n", (unsigned int) from, len); + pr_debug("onenand_bbt_read_oob: from = 0x%08x, len = %zi\n", + (unsigned int) from, len); readcmd = ONENAND_IS_4KB_PAGE(this) ? ONENAND_CMD_READ : ONENAND_CMD_READOOB; @@ -1417,7 +1420,8 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to, u_char *oobbuf; int ret = 0; - MTDDEBUG(MTD_DEBUG_LEVEL3, "onenand_write_ops_nolock: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len); + pr_debug("onenand_write_ops_nolock: to = 0x%08x, len = %i\n", + (unsigned int) to, (int) len); /* Initialize retlen, in case of early exit */ ops->retlen = 0; @@ -1538,7 +1542,8 @@ static int onenand_write_oob_nolock(struct mtd_info *mtd, loff_t to, to += ops->ooboffs; - MTDDEBUG(MTD_DEBUG_LEVEL3, "onenand_write_oob_nolock: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len); + pr_debug("onenand_write_oob_nolock: to = 0x%08x, len = %i\n", + (unsigned int) to, (int) len); /* Initialize retlen, in case of early exit */ ops->oobretlen = 0; @@ -1730,7 +1735,7 @@ int onenand_erase(struct mtd_info *mtd, struct erase_info *instr) struct mtd_erase_region_info *region = NULL; unsigned int region_end = 0; - MTDDEBUG(MTD_DEBUG_LEVEL3, "onenand_erase: start = 0x%08x, len = %i\n", + pr_debug("onenand_erase: start = 0x%08x, len = %i\n", (unsigned int) addr, len); if (FLEXONENAND(this)) { @@ -1746,8 +1751,7 @@ int onenand_erase(struct mtd_info *mtd, struct erase_info *instr) * Erase region's start offset is always block start address. */ if (unlikely((addr - region->offset) & (block_size - 1))) { - MTDDEBUG(MTD_DEBUG_LEVEL0, "onenand_erase:" - " Unaligned address\n"); + pr_debug("onenand_erase:" " Unaligned address\n"); return -EINVAL; } } else { @@ -1755,16 +1759,14 @@ int onenand_erase(struct mtd_info *mtd, struct erase_info *instr) /* Start address must align on block boundary */ if (unlikely(addr & (block_size - 1))) { - MTDDEBUG(MTD_DEBUG_LEVEL0, "onenand_erase:" - "Unaligned address\n"); + pr_debug("onenand_erase:" "Unaligned address\n"); return -EINVAL; } } /* Length must align on block boundary */ if (unlikely(len & (block_size - 1))) { - MTDDEBUG (MTD_DEBUG_LEVEL0, - "onenand_erase: Length not block aligned\n"); + pr_debug("onenand_erase: Length not block aligned\n"); return -EINVAL; } @@ -1793,12 +1795,12 @@ int onenand_erase(struct mtd_info *mtd, struct erase_info *instr) /* Check, if it is write protected */ if (ret) { if (ret == -EPERM) - MTDDEBUG (MTD_DEBUG_LEVEL0, "onenand_erase: " - "Device is write protected!!!\n"); + pr_debug("onenand_erase: " + "Device is write protected!!!\n"); else - MTDDEBUG (MTD_DEBUG_LEVEL0, "onenand_erase: " - "Failed erase, block %d\n", - onenand_block(this, addr)); + pr_debug("onenand_erase: " + "Failed erase, block %d\n", + onenand_block(this, addr)); instr->state = MTD_ERASE_FAILED; instr->fail_addr = addr; @@ -1849,7 +1851,7 @@ erase_exit: */ void onenand_sync(struct mtd_info *mtd) { - MTDDEBUG (MTD_DEBUG_LEVEL3, "onenand_sync: called\n"); + pr_debug("onenand_sync: called\n"); /* Grab the lock and see if the device is available */ onenand_get_device(mtd, FL_SYNCING); diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c index 2050700..cde342a 100644 --- a/drivers/mtd/onenand/onenand_bbt.c +++ b/drivers/mtd/onenand/onenand_bbt.c @@ -160,9 +160,8 @@ static int onenand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt) block = (int) (onenand_block(this, offs) << 1); res = (bbm->bbt[block >> 3] >> (block & 0x06)) & 0x03; - MTDDEBUG (MTD_DEBUG_LEVEL2, - "onenand_isbad_bbt: bbt info for offs 0x%08x: (block %d) 0x%02x\n", - (unsigned int)offs, block >> 1, res); + pr_debug("onenand_isbad_bbt: bbt info for offs 0x%08x: (block %d) 0x%02x\n", + (unsigned int)offs, block >> 1, res); switch ((int)res) { case 0x00: From patchwork Tue Oct 17 15:10:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 116124 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp5016619qgn; Tue, 17 Oct 2017 08:11:39 -0700 (PDT) X-Google-Smtp-Source: AOwi7QC6w2Uzjmkdvk70xv06ybfjOediPcVFul7KMPpi4QUWSCPbHeS594oFLq8DR+FcC2b/9ZFM X-Received: by 10.80.172.22 with SMTP id v22mr18371088edc.143.1508253099462; Tue, 17 Oct 2017 08:11:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508253099; cv=none; d=google.com; s=arc-20160816; b=RF44uQIMRN1ZcBhDgLBfHw7pMg15DMATb9CuFoJULDPz7930ODKM7U3f/n2n/MV65U giWOBxUJz3aGhs/c5z0LjLXtPHfldes4IRr7NVgoYTl1G0c9gZvmyr0lOBpLbLSQd3W9 Dbx8zN9Usj4jy2dKvAEmj1Dg6g3LbFUnq5bZBg0xN93HtmrNHNhxdu16347GCH4CjHUq 4z8XWp/w1VNpLhj0b4XbPezoEqNa3QeNUmrVI6XoBX6RlXy+HTOPFpdf+aArGoKHgd03 cNlFOXxh+yqlDWr8DKn8zPiRD/xikgdP/C3HDCpLmyWEfZsA6669p91ApHkDAdWx+W/t ewGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=x0ELTICoAZWzODTlt5WyCnrN02HNfS7V5yw3nlsi+6A=; b=D86IzYCxdZhPaho4NdO1DHzywaZci9MAuz507yGl4qSDCYpY8tqSeSk00zbgTNgvO4 F3rQz1F6rW/5NVPerP9pQE4RsH60QqNoGHvV3Lq5WIwBaon1Fk+2BrOAuXhkfPwexqkX yDjkuhHzMFGoQPAeOsdnSPOM29vK34yc1IgCTNLaPwtRGRqU8+czuVGWIycfl8w+N2ie KBK2YM6u8WBRwL3xjunaCSaGdPOvnGEOXCxhbG9hztDfaKmTit7ZpzxGmd6hh5rP+sWV p/U2RvbjK+A0RFf6ofIRsO6Aw0dN/lJg57w2W43AOBx6WJCpWC/kycAZmuhC8XE6HuSQ lJhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=aHIJRkgT; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id r16si1104953edl.492.2017.10.17.08.11.39; Tue, 17 Oct 2017 08:11:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=aHIJRkgT; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 1110FC21DE1; Tue, 17 Oct 2017 15:11:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id CD493C21C40; Tue, 17 Oct 2017 15:11:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 72419C21D72; Tue, 17 Oct 2017 15:11:30 +0000 (UTC) Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by lists.denx.de (Postfix) with ESMTPS id 6EA12C21C40 for ; Tue, 17 Oct 2017 15:11:29 +0000 (UTC) Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-11.nifty.com with ESMTP id v9HFAtr6010414; Wed, 18 Oct 2017 00:10:56 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com v9HFAtr6010414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1508253056; bh=SmKeycsntVoBCD0CsrpqYxsev0igs1ZiFsRPjykchFo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aHIJRkgTYWJQ6HKi0uXrfW3i9E2Buc28O9GAhsXVq2cgJo0Siq3T4MHQLGMW/JrO3 eq1maDTCeP0vr1rC5VzGqDuD0A2UmQwVYcNa7GCX5g+2z8V65bFtfx8QO0jhuSL7qN PUdV8VnWKmLzi3I8E/nHE7ju1AZek36Y3PTVeoCUSAcxHhJC22wI8+IdIHrNOUkwZM WCl3ldLFZvgbH4lrqrTusVoPk9wCGDHHChiVSGlyNcWIM+tjyBzBdGLxPhbh4/NOgK zThWzbpX4W5ErFTlR1avTiAxqREZKqDDULFAknciqFrOPBUrwri1USw8tBHWYkAGFw ASKjW345sY5dA== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Wed, 18 Oct 2017 00:10:49 +0900 Message-Id: <1508253049-4105-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508253049-4105-1-git-send-email-yamada.masahiro@socionext.com> References: <1508253049-4105-1-git-send-email-yamada.masahiro@socionext.com> Cc: Thomas Petazzoni , Alexandru Gagniuc , Joe Hershberger Subject: [U-Boot] [PATCH 2/2] mtd: remove MTDDEBUG() and CONFIG_MTD_DEBUG X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" All users of this macro have been converted. Remove MTDDEBUG and related CONFIG options. ubifs_dbg_msg_key() is kept. It is silent unless DEBUG is defined. I am not touching scripts/config_whitelist.txt. The deprecated options will be dropped by the next resync. Signed-off-by: Masahiro Yamada --- fs/ubifs/debug.h | 7 ------- include/configs/woodburn_common.h | 4 ---- include/linux/mtd/mtd.h | 24 ------------------------ 3 files changed, 35 deletions(-) diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h index 807ce1b..9814083 100644 --- a/fs/ubifs/debug.h +++ b/fs/ubifs/debug.h @@ -187,19 +187,12 @@ struct ubifs_global_debug_info { ##__VA_ARGS__) #define DBG_KEY_BUF_LEN 48 -#if defined CONFIG_MTD_DEBUG #define ubifs_dbg_msg_key(type, key, fmt, ...) do { \ char __tmp_key_buf[DBG_KEY_BUF_LEN]; \ pr_debug("UBIFS DBG " type ": " fmt "%s\n", \ ##__VA_ARGS__, \ dbg_snprintf_key(c, key, __tmp_key_buf, DBG_KEY_BUF_LEN)); \ } while (0) -#else -#define ubifs_dbg_msg_key(type, key, fmt, ...) do { \ - pr_debug("UBIFS DBG\n"); \ -} while (0) - -#endif #endif diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 7c08f0f..c07fb57 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -179,10 +179,6 @@ #define CONFIG_MXC_NAND_HWECC #define CONFIG_SYS_NAND_LARGEPAGE -#if 0 -#define CONFIG_MTD_DEBUG -#define CONFIG_MTD_DEBUG_VERBOSE 7 -#endif #define CONFIG_SYS_NAND_ONFI_DETECTION /* diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 3e1694b..4bde251 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -442,30 +442,6 @@ static inline void mtd_erase_callback(struct erase_info *instr) } #endif -#ifdef __UBOOT__ -/* - * Debugging macro and defines - */ -#define MTD_DEBUG_LEVEL0 (0) /* Quiet */ -#define MTD_DEBUG_LEVEL1 (1) /* Audible */ -#define MTD_DEBUG_LEVEL2 (2) /* Loud */ -#define MTD_DEBUG_LEVEL3 (3) /* Noisy */ - -#ifdef CONFIG_MTD_DEBUG -#define MTDDEBUG(n, args...) \ - do { \ - if (n <= CONFIG_MTD_DEBUG_VERBOSE) \ - printk(KERN_INFO args); \ - } while(0) -#else /* CONFIG_MTD_DEBUG */ -#define MTDDEBUG(n, args...) \ - do { \ - if (0) \ - printk(KERN_INFO args); \ - } while(0) -#endif /* CONFIG_MTD_DEBUG */ -#endif - static inline int mtd_is_bitflip(int err) { return err == -EUCLEAN; }