[PATCH 13/17] MTD: export few functions from nand_base.c

stanley.miao stanley.miao at windriver.com
Thu Feb 4 21:32:24 EST 2010


Maxim Levitsky wrote:
> This exports:
>
> nand_do_read_oob
> nand_do_write_oob
>   

nand_do_read_oob and nand_do_write_oob can't be exported. They are internal
functions in NAND subsystem. If you want use them, please use mtd->read_oob
and mtd->write_oob.

Stanley.

> 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 at 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 961c98f..3949d8c 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;
> @@ -753,6 +749,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
> @@ -1532,7 +1529,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;
> @@ -1616,6 +1613,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
> @@ -2108,7 +2106,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;
> @@ -2179,6 +2177,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
> @@ -3080,6 +3079,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
>   




More information about the linux-mtd mailing list