From: Marek Vasut <marek.vasut@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 6/8] PPC: Fix eepro100_eeprom.c by renaming "debug" to "eedebug"
Date: Mon, 3 Oct 2011 02:57:28 +0200 [thread overview]
Message-ID: <1317603450-7527-7-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>
Also, squash a warning about initialized static data.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
examples/standalone/eepro100_eeprom.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/standalone/eepro100_eeprom.c b/examples/standalone/eepro100_eeprom.c
index 3c7f380..889ab55 100644
--- a/examples/standalone/eepro100_eeprom.c
+++ b/examples/standalone/eepro100_eeprom.c
@@ -59,7 +59,7 @@ static unsigned short eeprom[256];
static int eeprom_size = 64;
static int eeprom_addr_size = 6;
-static int debug = 0;
+static int eedebug;
static inline unsigned short swap16(unsigned short x)
{
@@ -123,7 +123,7 @@ static int do_eeprom_cmd(long ioaddr, int cmd, int cmd_len)
unsigned retval = 0;
long ee_addr = ioaddr + EE_OFFSET;
- if (debug > 1)
+ if (eedebug > 1)
printf(" EEPROM op 0x%x: ", cmd);
outw(EE_ENB | EE_SHIFT_CLK, ee_addr);
@@ -133,7 +133,7 @@ static int do_eeprom_cmd(long ioaddr, int cmd, int cmd_len)
short dataval = (cmd & (1 << cmd_len)) ? EE_WRITE_1 : EE_WRITE_0;
outw(dataval, ee_addr);
eeprom_delay(ee_addr);
- if (debug > 2)
+ if (eedebug > 2)
printf("%X", inw(ee_addr) & 15);
outw(dataval | EE_SHIFT_CLK, ee_addr);
eeprom_delay(ee_addr);
@@ -144,7 +144,7 @@ static int do_eeprom_cmd(long ioaddr, int cmd, int cmd_len)
#endif
/* Terminate the EEPROM access. */
outw(EE_ENB & ~EE_CS, ee_addr);
- if (debug > 1)
+ if (eedebug > 1)
printf(" EEPROM result is 0x%5.5x.\n", retval);
return retval;
}
@@ -170,7 +170,7 @@ static void write_eeprom(long ioaddr, int index, int value, int addr_len)
3 + addr_len + 16);
/* Poll for write finished. */
i = eeprom_busy_poll(ee_ioaddr); /* Typical 2000 ticks */
- if (debug)
+ if (eedebug)
printf(" Write finished after %d ticks.\n", i);
/* Disable programming. This command is not instantaneous, so we check
for busy before the next op. */
--
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 ` Marek Vasut [this message]
2011-10-03 14:34 ` [U-Boot] [PATCH 6/8] PPC: Fix eepro100_eeprom.c by renaming "debug" to "eedebug" Wolfgang Denk
2011-10-03 0:57 ` [U-Boot] [PATCH 7/8] PPC: Fix fsl_upm.c by renaming nand handling functions Marek Vasut
2011-10-03 14:35 ` 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-7-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