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; }