From: Peter Pan <peterpansjtu@gmail.com>
To: computersforpeace@gmail.com, dwmw2@infradead.org,
boris.brezillon@free-electrons.com
Cc: linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org,
karlzhang@micron.com, beanhuo@micron.com,
xuejiancheng@huawei.com, Peter Pan <peterpandong@micron.com>
Subject: [PATCH 07/11] mtd: nand: make nand_erase_nand() static
Date: Mon, 14 Mar 2016 02:48:00 +0000 [thread overview]
Message-ID: <1457923684-13505-8-git-send-email-peterpandong@micron.com> (raw)
In-Reply-To: <1457923684-13505-1-git-send-email-peterpandong@micron.com>
From: Brian Norris <computersforpeace@gmail.com>
nand_bbt.c doesn't need to call nand_erase_nand() any more.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Peter Pan <peterpandong@micron.com>
---
drivers/mtd/nand/nand_base.c | 5 ++++-
include/linux/mtd/nand.h | 2 --
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 6f0e3b9..371e65f 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -97,6 +97,9 @@ static int nand_get_device(struct mtd_info *mtd, int new_state);
static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
struct mtd_oob_ops *ops);
+static int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
+ int allowbbt);
+
/*
* For devices which display every fart in the system on a separate LED. Is
* compiled away when LED support is disabled.
@@ -2897,7 +2900,7 @@ static int nand_erase(struct mtd_info *mtd, struct erase_info *instr)
*
* Erase one ore more blocks.
*/
-int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
+static int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
int allowbbt)
{
int page, status, pages_per_block, ret, chipnr;
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 5072041..8730afd 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -896,8 +896,6 @@ extern struct nand_manufacturers nand_manuf_ids[];
extern int nand_markbad_bbt(struct mtd_info *mtd, loff_t offs);
extern int nand_isreserved_bbt(struct mtd_info *mtd, loff_t offs);
extern int nand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt);
-extern int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
- int allowbbt);
extern int nand_do_read(struct mtd_info *mtd, loff_t from, size_t len,
size_t *retlen, uint8_t *buf);
--
1.9.1
next prev parent reply other threads:[~2016-03-14 2:53 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-14 2:47 [PATCH 00/11] mtd: nand_bbt: introduce independent nand BBT Peter Pan
2016-03-14 2:47 ` [PATCH 01/11] mtd: nand_bbt: new header for nand family BBT Peter Pan
2016-03-14 2:47 ` [PATCH 02/11] mtd: nand_bbt: introduce BBT related data structure Peter Pan
2016-03-25 8:35 ` Boris Brezillon
2016-03-28 8:09 ` Peter Pan
2016-03-29 8:16 ` Boris Brezillon
2016-04-18 6:22 ` Peter Pan
2016-04-18 7:44 ` Boris Brezillon
2016-04-19 0:40 ` Peter Pan
2016-04-19 7:34 ` Boris Brezillon
2016-05-04 1:36 ` Peter Pan
2016-05-04 20:33 ` Boris Brezillon
2016-05-17 1:03 ` Peter Pan
2016-06-17 2:38 ` Peter Pan
2016-06-21 13:27 ` Boris Brezillon
2016-03-14 2:47 ` [PATCH 03/11] mtd: nand_bbt: add new API definitions Peter Pan
2016-03-14 3:47 ` kbuild test robot
2016-03-25 8:49 ` Boris Brezillon
2016-03-28 7:56 ` Peter Pan
2016-03-14 2:47 ` [PATCH 04/11] mtd: nand_bbt: add nand_bbt_markbad_factory() interface Peter Pan
2016-03-14 2:47 ` [PATCH 05/11] mtd: nand: use new BBT API instead of old ones Peter Pan
2016-03-25 8:51 ` Boris Brezillon
2016-03-28 8:12 ` Peter Pan
2016-03-29 8:07 ` Boris Brezillon
2016-03-14 2:47 ` [PATCH 06/11] mtd: nand_bbt: use struct nand_bbt_ops in BBT Peter Pan
2016-03-14 2:48 ` Peter Pan [this message]
2016-03-14 2:48 ` [PATCH 08/11] mtd: nand_bbt: remove struct nand_chip from nand_bbt.c Peter Pan
2016-03-14 2:48 ` [PATCH 09/11] mtd: nand_bbt: remove old API definitions Peter Pan
2016-03-14 2:48 ` [PATCH 10/11] mtd: nand_bbt: remove NAND_BBT_DYNAMICSTRUCT macro Peter Pan
2016-03-14 2:48 ` [PATCH 11/11] mtd: nand: remove nand_chip.bbt Peter Pan
2016-03-14 2:57 ` [PATCH 00/11] mtd: nand_bbt: introduce independent nand BBT Peter Pan
2016-03-16 12:57 ` Boris Brezillon
2016-03-23 20:57 ` Ezequiel Garcia
2016-03-28 8:20 ` Peter Pan
2016-03-29 8:02 ` Boris Brezillon
2016-03-25 8:50 ` Boris Brezillon
2016-03-28 7:56 ` Peter Pan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1457923684-13505-8-git-send-email-peterpandong@micron.com \
--to=peterpansjtu@gmail.com \
--cc=beanhuo@micron.com \
--cc=boris.brezillon@free-electrons.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=karlzhang@micron.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=peterpandong@micron.com \
--cc=xuejiancheng@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®