From: Marek Vasut <marek.vasut@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 7/8] PPC: Fix fsl_upm.c by renaming nand handling functions
Date: Mon, 3 Oct 2011 02:57:29 +0200 [thread overview]
Message-ID: <1317603450-7527-8-git-send-email-marek.vasut@gmail.com> (raw)
In-Reply-To: <1317603450-7527-1-git-send-email-marek.vasut@gmail.com>
From: Marek Vasut <marex@pollux.denx.de>
This avoids colision with nand subsystem's functions.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Scott Wood <scottwood@freescale.com>
---
drivers/mtd/nand/fsl_upm.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index c33e278..31c174b 100644
--- 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);
}
-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);
}
-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;
@@ -147,7 +147,7 @@ static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
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;
@@ -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);
}
-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;
@@ -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
- 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;
--
1.7.6.2
next prev parent reply other threads:[~2011-10-03 0:57 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-03 0:57 [U-Boot] [PATCH 0/8] Fix PPC issues introduced by debug() macro change Marek Vasut
2011-10-03 0:57 ` [U-Boot] [PATCH 1/8] PPC: Fix tqm8xx_pcmcia.c by removing condition around pcmp Marek Vasut
2011-10-03 14:26 ` Wolfgang Denk
2011-10-03 0:57 ` [U-Boot] [PATCH 2/8] PPC: Fix mem_to_mem_idma2intr.c by renaming "debug" to "mmdebug" Marek Vasut
2011-10-03 14:28 ` Wolfgang Denk
2011-10-03 0:57 ` [U-Boot] [PATCH 3/8] PPC: Fix i82365.c by removing ifdef around "buf" Marek Vasut
2011-10-03 14:29 ` Wolfgang Denk
2011-10-03 0:57 ` [U-Boot] [PATCH 4/8] PPC: Fix relative path in galileo/core.h Marek Vasut
2011-10-03 14:31 ` Wolfgang Denk
2011-10-03 14:46 ` Marek Vasut
2011-10-03 0:57 ` [U-Boot] [PATCH 5/8] PPC: Fix pd67290.c by removing ifdef around "buf" Marek Vasut
2011-10-03 14:32 ` Wolfgang Denk
2011-10-03 0:57 ` [U-Boot] [PATCH 6/8] PPC: Fix eepro100_eeprom.c by renaming "debug" to "eedebug" Marek Vasut
2011-10-03 14:34 ` Wolfgang Denk
2011-10-03 0:57 ` Marek Vasut [this message]
2011-10-03 14:35 ` [U-Boot] [PATCH 7/8] PPC: Fix fsl_upm.c by renaming nand handling functions Wolfgang Denk
2011-10-03 0:57 ` [U-Boot] [PATCH 8/8] PPC: Remove #ifdef DEBUG around step_to_string Marek Vasut
2011-10-03 14:39 ` Wolfgang Denk
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=1317603450-7527-8-git-send-email-marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=u-boot@lists.denx.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