From: Maxim Levitsky <maximlevitsky@gmail.com>
To: David Woodhouse <dwmw2@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>, joern <joern@logfs.org>,
linux-mtd <linux-mtd@lists.infradead.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
Alex Dubov <oakad@yahoo.com>
Subject: [PATCH 4/6] MTD: export few functions from nand_base.c
Date: Fri, 22 Jan 2010 18:00:20 +0200 [thread overview]
Message-ID: <1264176020.24012.46.camel@maxim-laptop> (raw)
In-Reply-To: <1264175781.24012.42.camel@maxim-laptop>
>From 682591265a03966b495f21ff6b77dfb5fadcbefa Mon Sep 17 00:00:00 2001
From: Maxim Levitsky <maximlevitsky@gmail.com>
Date: Fri, 22 Jan 2010 16:41:34 +0200
Subject: [PATCH 4/6] MTD: export few functions from nand_base.c
This exports:
nand_do_read_oob
nand_do_write_oob
nand_get_device
nand_put_device
This functions will be used to implement custom oob based
bad block handling in upcoming smartmedia common module
Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
---
drivers/mtd/nand/nand_base.c | 18 +++++++++---------
include/linux/mtd/nand.h | 12 ++++++++++++
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 29e986e..e433103 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -96,11 +96,6 @@ static struct nand_ecclayout nand_oob_128 = {
.length = 78}}
};
-static int nand_get_device(struct nand_chip *chip, 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);
/*
* For devices which display every fart in the system on a separate LED. Is
@@ -114,7 +109,7 @@ DEFINE_LED_TRIGGER(nand_led_trigger);
*
* Deselect, release chip lock and wake up anyone waiting on the device
*/
-static void nand_release_device(struct mtd_info *mtd)
+void nand_release_device(struct mtd_info *mtd)
{
struct nand_chip *chip = mtd->priv;
@@ -128,6 +123,7 @@ static void nand_release_device(struct mtd_info *mtd)
wake_up(&chip->controller->wq);
spin_unlock(&chip->controller->lock);
}
+EXPORT_SYMBOL_GPL(nand_release_device);
/**
* nand_read_byte - [DEFAULT] read one byte from the chip
@@ -721,7 +717,7 @@ static void panic_nand_get_device(struct nand_chip *chip,
*
* Get the device and lock it for exclusive access
*/
-static int
+int
nand_get_device(struct nand_chip *chip, struct mtd_info *mtd, int new_state)
{
spinlock_t *lock = &chip->controller->lock;
@@ -756,6 +752,7 @@ nand_get_device(struct nand_chip *chip, struct mtd_info *mtd, int new_state)
remove_wait_queue(wq, &wait);
goto retry;
}
+EXPORT_SYMBOL_GPL(nand_get_device);
/**
* panic_nand_wait - [GENERIC] wait until the command is done
@@ -1535,7 +1532,7 @@ static int nand_write_oob_syndrome(struct mtd_info *mtd,
*
* NAND read out-of-band data from the spare area
*/
-static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
+int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
struct mtd_oob_ops *ops)
{
int page, realpage, chipnr, sndcmd = 1;
@@ -1619,6 +1616,7 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
ops->oobretlen = ops->ooblen;
return 0;
}
+EXPORT_SYMBOL_GPL(nand_do_read_oob);
/**
* nand_read_oob - [MTD Interface] NAND read data and/or out-of-band
@@ -2111,7 +2109,7 @@ static int nand_write(struct mtd_info *mtd, loff_t to, size_t len,
*
* NAND write out-of-band
*/
-static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
+int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
struct mtd_oob_ops *ops)
{
int chipnr, page, status, len;
@@ -2182,6 +2180,7 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
return 0;
}
+EXPORT_SYMBOL_GPL(nand_do_write_oob);
/**
* nand_write_oob - [MTD Interface] NAND write data and/or out-of-band
@@ -3083,6 +3082,7 @@ EXPORT_SYMBOL_GPL(nand_scan_ident);
EXPORT_SYMBOL_GPL(nand_scan_tail);
EXPORT_SYMBOL_GPL(nand_release);
+
static int __init nand_base_init(void)
{
led_trigger_register_simple("nand-disk", &nand_led_trigger);
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index ccab9df..8c2333a 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -469,6 +469,18 @@ extern int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
extern int nand_do_read(struct mtd_info *mtd, loff_t from, size_t len,
size_t * retlen, uint8_t * buf);
+extern int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
+ struct mtd_oob_ops *ops);
+
+extern int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
+ struct mtd_oob_ops *ops);
+
+extern int nand_get_device(struct nand_chip *chip,
+ struct mtd_info *mtd, int new_state);
+
+extern void nand_release_device(struct mtd_info *mtd);
+
+
/**
* struct platform_nand_chip - chip level device structure
* @nr_chips: max. number of chips to scan for
--
1.6.3.3
next prev parent reply other threads:[~2010-01-22 16:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-22 15:56 [PATCH 0/6] MTD: Many fixes and preparation for SmartMedia support in nand subsystem Maxim Levitsky
2010-01-22 15:57 ` [PATCH 1/6] MTD: nand: make MTD_OOB_PLACE work correctly Maxim Levitsky
2010-01-22 15:58 ` [PATCH 2/6] MTD: nand: make reads using MTD_OOB_RAW affect only ECC validation Maxim Levitsky
2010-01-22 15:59 ` [PATCH 3/6] MTD: nand: fix bug that prevented write of more that one page by ->write_oob Maxim Levitsky
2010-01-22 16:00 ` Maxim Levitsky [this message]
2010-01-22 16:01 ` [PATCH 5/6] MTD: common module for smartmedia/xD support Maxim Levitsky
2010-01-22 16:02 ` [PATCH 6/6] MTD: add few workarounds to nand system for SmartMedia/xD chips Maxim Levitsky
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=1264176020.24012.46.camel@maxim-laptop \
--to=maximlevitsky@gmail.com \
--cc=dwmw2@infradead.org \
--cc=joern@logfs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=oakad@yahoo.com \
--cc=tglx@linutronix.de \
/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