From patchwork Sat Aug 3 09:52:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 264413 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 798C22C0087 for ; Sat, 3 Aug 2013 19:55:14 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V5YXg-0003AE-Uh; Sat, 03 Aug 2013 09:54:33 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V5YXN-0006g5-4p; Sat, 03 Aug 2013 09:54:13 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V5YXA-0006dl-7R for linux-mtd@merlin.infradead.org; Sat, 03 Aug 2013 09:54:00 +0000 Received: from mail-pd0-x22c.google.com ([2607:f8b0:400e:c02::22c]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V5YWx-0002af-9A for linux-mtd@lists.infradead.org; Sat, 03 Aug 2013 09:53:48 +0000 Received: by mail-pd0-f172.google.com with SMTP id z11so1501297pdj.3 for ; Sat, 03 Aug 2013 02:53:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=y8UkImQRRu3AZ5deaNjR7F1xr2wlgaXGHdU544y+UCs=; b=sQySbJb8YlizHj8tDglWzNsS0oWQrqopgKgj1viZvAy+Xc5exwMQ7KQcRI6vpN/XAM rbNAdFMaxJYHo/1WdheF7Vjuy+58H7S1CyQ2VoLYryDZlBwapVWoSQcDZCO2ATkKCbdh N5RY3wbiIMFuu2K8qj4ZvSqdIFcmPv79RJE7CdueqIIe2YLS16swC5KMReAIX7cBDPEW m/+s2gMZVL+iz+j2I4tMepQq6MJiLAsqpmeMLuqw1BijrcGwqc3j6ft5D6ApgZX7khWw HKzs9o3anecaTV/NUK+RKx9IntDQ5mHs3nkpvRRkFhGTnhGZZ5fpSP2AaZ7rqZkt4nAT B0Ww== X-Received: by 10.66.122.41 with SMTP id lp9mr15050857pab.6.1375523603860; Sat, 03 Aug 2013 02:53:23 -0700 (PDT) Received: from localhost.localdomain (KD113145060135.ppp-bb.dion.ne.jp. [113.145.60.135]) by mx.google.com with ESMTPSA id ib9sm15295755pbc.43.2013.08.03.02.53.21 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 03 Aug 2013 02:53:23 -0700 (PDT) From: Akinobu Mita To: linux-mtd@lists.infradead.org Subject: [PATCH -next v2 10/10] mtd: mtd_nandbiterrs: use mtd_test helpers Date: Sat, 3 Aug 2013 18:52:16 +0900 Message-Id: <1375523536-32671-11-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1375523536-32671-1-git-send-email-akinobu.mita@gmail.com> References: <1375523536-32671-1-git-send-email-akinobu.mita@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130803_105347_512504_0C28ADB0 X-CRM114-Status: GOOD ( 13.84 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on casper.infradead.org summary: Content analysis details: (-2.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (akinobu.mita[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Artem Bityutskiy , Iwo Mergler , Adrian Hunter , Akinobu Mita , Vikram Narayanan , Brian Norris , David Woodhouse X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Use mtdtest_write() and mtdtest_erase_eraseblock() in mtd_test helpers. Signed-off-by: Akinobu Mita Cc: Iwo Mergler Cc: Brian Norris Cc: Vikram Narayanan Cc: Adrian Hunter Cc: Artem Bityutskiy Cc: David Woodhouse Cc: linux-mtd@lists.infradead.org --- * Newly added patch from v2 drivers/mtd/tests/nandbiterrs.c | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/drivers/mtd/tests/nandbiterrs.c b/drivers/mtd/tests/nandbiterrs.c index 207bf9a..5a8c858 100644 --- a/drivers/mtd/tests/nandbiterrs.c +++ b/drivers/mtd/tests/nandbiterrs.c @@ -49,6 +49,7 @@ #include #include #include +#include "mtd_test.h" static int dev; module_param(dev, int, S_IRUGO); @@ -98,45 +99,17 @@ static uint8_t hash(unsigned offset) return c; } -static int erase_block(void) -{ - int err; - struct erase_info ei; - loff_t addr = eraseblock * mtd->erasesize; - - pr_info("erase_block\n"); - - memset(&ei, 0, sizeof(struct erase_info)); - ei.mtd = mtd; - ei.addr = addr; - ei.len = mtd->erasesize; - - err = mtd_erase(mtd, &ei); - if (err || ei.state == MTD_ERASE_FAILED) { - pr_err("error %d while erasing\n", err); - if (!err) - err = -EIO; - return err; - } - - return 0; -} - /* Writes wbuffer to page */ static int write_page(int log) { - int err = 0; - size_t written; + int err; if (log) pr_info("write_page\n"); - err = mtd_write(mtd, offset, mtd->writesize, &written, wbuffer); - if (err || written != mtd->writesize) { + err = mtdtest_write(mtd, offset, mtd->writesize, wbuffer); + if (err) pr_err("error: write failed at %#llx\n", (long long)offset); - if (!err) - err = -EIO; - } return err; } @@ -415,7 +388,7 @@ static int __init mtd_nandbiterrs_init(void) goto exit_rbuffer; } - err = erase_block(); + err = mtdtest_erase_eraseblock(mtd, eraseblock); if (err) goto exit_error; @@ -428,7 +401,7 @@ static int __init mtd_nandbiterrs_init(void) goto exit_error; /* We leave the block un-erased in case of test failure. */ - err = erase_block(); + err = mtdtest_erase_eraseblock(mtd, eraseblock); if (err) goto exit_error;