From: Heiko Schocher <hs@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] I2C: Fix CodingStyle issues in soft_i2c.c
Date: Mon, 29 Sep 2008 09:57:12 +0200 [thread overview]
Message-ID: <48E08A58.5060000@denx.de> (raw)
Signed-off-by: Heiko Schocher <hs@denx.de>
---
drivers/i2c/soft_i2c.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c
index f426bbb..bda0aaf 100644
--- a/drivers/i2c/soft_i2c.c
+++ b/drivers/i2c/soft_i2c.c
@@ -93,10 +93,10 @@ static uchar read_byte (int);
*/
static void send_reset(void)
{
-#ifdef CONFIG_MPC8260
+#if defined(CONFIG_MPC8260)
volatile ioport_t *iop = ioport_addr((immap_t *)CFG_IMMR, I2C_PORT);
#endif
-#ifdef CONFIG_8xx
+#if defined(CONFIG_8xx) && !defined(CONFIG_MGSUVD)
volatile immap_t *immr = (immap_t *)CFG_IMMR;
#endif
int j;
@@ -125,10 +125,10 @@ static void send_reset(void)
*/
static void send_start(void)
{
-#ifdef CONFIG_MPC8260
+#if defined(CONFIG_MPC8260)
volatile ioport_t *iop = ioport_addr((immap_t *)CFG_IMMR, I2C_PORT);
#endif
-#ifdef CONFIG_8xx
+#if defined(CONFIG_8xx) && !defined(CONFIG_MGSUVD)
volatile immap_t *immr = (immap_t *)CFG_IMMR;
#endif
@@ -147,10 +147,10 @@ static void send_start(void)
*/
static void send_stop(void)
{
-#ifdef CONFIG_MPC8260
+#if defined(CONFIG_MPC8260)
volatile ioport_t *iop = ioport_addr((immap_t *)CFG_IMMR, I2C_PORT);
#endif
-#ifdef CONFIG_8xx
+#if defined(CONFIG_8xx) && !defined(CONFIG_MGSUVD)
volatile immap_t *immr = (immap_t *)CFG_IMMR;
#endif
@@ -172,10 +172,10 @@ static void send_stop(void)
*/
static void send_ack(int ack)
{
-#ifdef CONFIG_MPC8260
+#if defined(CONFIG_MPC8260)
volatile ioport_t *iop = ioport_addr((immap_t *)CFG_IMMR, I2C_PORT);
#endif
-#ifdef CONFIG_8xx
+#if defined(CONFIG_8xx) && !defined(CONFIG_MGSUVD)
volatile immap_t *immr = (immap_t *)CFG_IMMR;
#endif
@@ -197,10 +197,10 @@ static void send_ack(int ack)
*/
static int write_byte(uchar data)
{
-#ifdef CONFIG_MPC8260
+#if defined(CONFIG_MPC8260)
volatile ioport_t *iop = ioport_addr((immap_t *)CFG_IMMR, I2C_PORT);
#endif
-#ifdef CONFIG_8xx
+#if defined(CONFIG_8xx) && !defined(CONFIG_MGSUVD)
volatile immap_t *immr = (immap_t *)CFG_IMMR;
#endif
int j;
@@ -290,10 +290,10 @@ int i2c_set_bus_speed(unsigned int speed)
*/
static uchar read_byte(int ack)
{
-#ifdef CONFIG_MPC8260
+#if defined(CONFIG_MPC8260)
volatile ioport_t *iop = ioport_addr((immap_t *)CFG_IMMR, I2C_PORT);
#endif
-#ifdef CONFIG_8xx
+#if defined(CONFIG_8xx) && !defined(CONFIG_MGSUVD)
volatile immap_t *immr = (immap_t *)CFG_IMMR;
#endif
int data;
--
1.5.6.1
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
next reply other threads:[~2008-09-29 7:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-29 7:57 Heiko Schocher [this message]
2008-09-29 9:12 ` [U-Boot] [PATCH] I2C: Fix CodingStyle issues in soft_i2c.c Wolfgang Denk
2008-10-14 16:25 ` 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=48E08A58.5060000@denx.de \
--to=hs@denx.de \
--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