From patchwork Thu Feb 5 22:32:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Brownell X-Patchwork-Id: 22306 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9AD59DDDED for ; Fri, 6 Feb 2009 18:42:16 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1LVLKk-0001aR-Pe; Fri, 06 Feb 2009 07:41:06 +0000 Received: from smtp123.sbc.mail.sp1.yahoo.com ([69.147.64.96]) by bombadil.infradead.org with smtp (Exim 4.69 #1 (Red Hat Linux)) id 1LVClx-0003Wq-PN for linux-mtd@lists.infradead.org; Thu, 05 Feb 2009 22:32:38 +0000 Received: (qmail 76831 invoked from network); 5 Feb 2009 22:32:36 -0000 Received: from unknown (HELO pogo) (david-b@69.226.224.20 with plain) by smtp123.sbc.mail.sp1.yahoo.com with SMTP; 5 Feb 2009 22:32:35 -0000 X-YMail-OSG: rhIAeSkVM1kknvRTMd.vo_HQ58mOqWaiF2cTtif7sNU09gHJxnttaCs4YcwhgjktFZDFc8UPVLKn.NYQowG5Eplm9PC8FCI2IvSsQOIPHgH3ExrKY_TVKBDMR7pI54Ir.5mnSKQsM_pbFSOZEX5S0wpf3tvikwn.t2kVqwgQsi7Dw6kypoCExhI.Gyg0SGeM8Q-- X-Yahoo-Newman-Property: ymail-3 From: David Brownell To: Linux MTD Subject: [patch 2.6.29-rc3] NAND: =?iso-8859-1?q?=A0fix_broken_debug_messages?= (v2) Date: Thu, 5 Feb 2009 14:32:34 -0800 User-Agent: KMail/1.9.10 References: <200902021813.20748.david-b@pacbell.net> In-Reply-To: <200902021813.20748.david-b@pacbell.net> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200902051432.34788.david-b@pacbell.net> X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-Spam-Note: SpamAssassin invocation failed X-Mailman-Approved-At: Fri, 06 Feb 2009 02:41:05 -0500 X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: David Brownell Fix incorrect debug messages (*write* not read); someone committed some cut'n'paste bugs.  There might be more, I only noticed these since I was looking for nand_read usage and landed in some very wrong functions. IMO all MTD debugging message framework is goofed, anyway. It uses "DEBUG" in a way that's incompatible with usage most everywhere else in the kernel, and which prevents normal pr_dbg() and dev_dbg() calls from working right. Signed-off-by: David Brownell --- Fix a goofed string. drivers/mtd/nand/nand_base.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -1948,7 +1948,7 @@ static int nand_do_write_oob(struct mtd_ } if (unlikely(ops->ooboffs >= len)) { - DEBUG(MTD_DEBUG_LEVEL0, "nand_read_oob: " + DEBUG(MTD_DEBUG_LEVEL0, "nand_do_write_oob: " "Attempt to start write outside oob\n"); return -EINVAL; } @@ -1958,7 +1958,7 @@ static int nand_do_write_oob(struct mtd_ ops->ooboffs + ops->ooblen > ((mtd->size >> chip->page_shift) - (to >> chip->page_shift)) * len)) { - DEBUG(MTD_DEBUG_LEVEL0, "nand_read_oob: " + DEBUG(MTD_DEBUG_LEVEL0, "nand_do_write_oob: " "Attempt write beyond end of device\n"); return -EINVAL; } @@ -2014,8 +2014,8 @@ static int nand_write_oob(struct mtd_inf /* Do not allow writes past end of device */ if (ops->datbuf && (to + ops->len) > mtd->size) { - DEBUG(MTD_DEBUG_LEVEL0, "nand_read_oob: " - "Attempt read beyond end of device\n"); + DEBUG(MTD_DEBUG_LEVEL0, "nand_write_oob: " + "Attempt write beyond end of device\n"); return -EINVAL; }