From 2a19794edcbea2ee168a3fec2058031290f5c826 Mon Sep 17 00:00:00 2001
From: Rajendra Nayak <rnayak@ti.com>
Date: Tue, 13 Mar 2012 22:55:24 +0530
Subject: [PATCH] --- yaml --- r: 298733 b: refs/heads/master c:
 f9a2f9c3fa76eec55928e8e06f3094c8f01df7cb h: refs/heads/master i:   298731:
 45b7c157405492d0c53e6b64aaed16a57366e4a3 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/arm/mach-omap2/omap_hwmod.c | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 7ad6ab46f119..b88d5795390a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2800852a079504f35f88e44faf5c9c96318c0cca
+refs/heads/master: f9a2f9c3fa76eec55928e8e06f3094c8f01df7cb
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod.c b/trunk/arch/arm/mach-omap2/omap_hwmod.c
index d32c1ce4f3ab..72903d42ab0d 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod.c
@@ -1901,20 +1901,10 @@ void omap_hwmod_write(u32 v, struct omap_hwmod *oh, u16 reg_offs)
  */
 int omap_hwmod_softreset(struct omap_hwmod *oh)
 {
-	u32 v;
-	int ret;
-
-	if (!oh || !(oh->_sysc_cache))
+	if (!oh)
 		return -EINVAL;
 
-	v = oh->_sysc_cache;
-	ret = _set_softreset(oh, &v);
-	if (ret)
-		goto error;
-	_write_sysconfig(v, oh);
-
-error:
-	return ret;
+	return _ocp_softreset(oh);
 }
 
 /**