PPC: Fix fsl_upm.c by renaming nand handling functions

This avoids colision with nand subsystem's functions.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>

diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index c33e2786b2e81d43bbbde2de24f26ed48f049d9e..31c174bd3bc05bd18532f9ac820ee16d4acd248b 100644 (file)
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -124,14 +124,14 @@ static void fun_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
                fun_wait(fun);
 }
 
                fun_wait(fun);
 }
 

-static u8 nand_read_byte(struct mtd_info *mtd)
+static u8 upm_nand_read_byte(struct mtd_info *mtd)

 {
        struct nand_chip *chip = mtd->priv;
 
        return in_8(chip->IO_ADDR_R);
 }
 
 {
        struct nand_chip *chip = mtd->priv;
 
        return in_8(chip->IO_ADDR_R);
 }
 

-static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
+static void upm_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)

 {
        int i;
        struct nand_chip *chip = mtd->priv;
 {
        int i;
        struct nand_chip *chip = mtd->priv;


@@ -147,7 +147,7 @@ static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
                fun_wait(fun);
 }
 
                fun_wait(fun);
 }
 

-static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
+static void upm_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)

 {
        int i;
        struct nand_chip *chip = mtd->priv;
 {
        int i;
        struct nand_chip *chip = mtd->priv;


@@ -156,7 +156,7 @@ static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
                buf[i] = in_8(chip->IO_ADDR_R);
 }
 
                buf[i] = in_8(chip->IO_ADDR_R);
 }
 

-static int nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
+static int upm_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)

 {
        int i;
        struct nand_chip *chip = mtd->priv;
 {
        int i;
        struct nand_chip *chip = mtd->priv;


@@ -191,10 +191,10 @@ int fsl_upm_nand_init(struct nand_chip *chip, struct fsl_upm_nand *fun)
 #if CONFIG_SYS_NAND_MAX_CHIPS > 1
        chip->select_chip = fun_select_chip;
 #endif
 #if CONFIG_SYS_NAND_MAX_CHIPS > 1
        chip->select_chip = fun_select_chip;
 #endif

-       chip->read_byte = nand_read_byte;
-       chip->read_buf = nand_read_buf;
-       chip->write_buf = nand_write_buf;
-       chip->verify_buf = nand_verify_buf;
+       chip->read_byte = upm_nand_read_byte;
+       chip->read_buf = upm_nand_read_buf;
+       chip->write_buf = upm_nand_write_buf;
+       chip->verify_buf = upm_nand_verify_buf;

        if (fun->dev_ready)
                chip->dev_ready = nand_dev_ready;
 
        if (fun->dev_ready)
                chip->dev_ready = nand_dev_ready;