From: Troy Kisky <troy.kisky@boundarydevices.com>
Date: Thu, 19 Jul 2012 08:18:12 +0000 (+0000)
Subject: mxc_i2c: place i2c_reset code inline
X-Git-Tag: v2012.10-rc1~415^2~23
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=83a1a19038b0bf36c966b7c7b67708e19b45c3b5;p=oweals%2Fu-boot.git

mxc_i2c: place i2c_reset code inline

imx_reset is only referenced once so
move to that location.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Marek Vasut <marex@denx.de>
---

diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index 9efa9bdae5..717bc7ae01 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -113,17 +113,6 @@ static uint8_t i2c_imx_get_clk(unsigned int rate)
 	return clk_div;
 }
 
-/*
- * Reset I2C Controller
- */
-void i2c_reset(void)
-{
-	struct mxc_i2c_regs *i2c_regs = (struct mxc_i2c_regs *)I2C_BASE;
-
-	writeb(0, &i2c_regs->i2cr);	/* Reset module */
-	writeb(0, &i2c_regs->i2sr);
-}
-
 /*
  * Init I2C Bus
  */
@@ -136,7 +125,9 @@ void i2c_init(int speed, int unused)
 	/* Store divider value */
 	writeb(idx, &i2c_regs->ifdr);
 
-	i2c_reset();
+	/* Reset module */
+	writeb(0, &i2c_regs->i2cr);
+	writeb(0, &i2c_regs->i2sr);
 }
 
 /*