Merge branch 'misc_2.6.37' of git://git.pwsan.com/linux-2.6 into omap-for-linus

1 files changed, 14 insertions, 21 deletions

diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
index b5e5f6074b0..abe933cd8f0 100644
--- a/arch/arm/plat-omap/omap_device.c
+++ b/arch/arm/plat-omap/omap_device.c
@@ -290,12 +290,11 @@ static void _add_optional_clock_alias(struct omap_device *od,
  */
 int omap_device_count_resources(struct omap_device *od)
 {
-        struct omap_hwmod *oh;
         int c = 0;
         int i;
 
-        for (i = 0, oh = *od->hwmods; i < od->hwmods_cnt; i++, oh++)
-                c += omap_hwmod_count_resources(oh);
+        for (i = 0; i < od->hwmods_cnt; i++)
+                c += omap_hwmod_count_resources(od->hwmods[i]);
 
         pr_debug("omap_device: %s: counted %d total resources across %d "
                  "hwmods\n", od->pdev.name, c, od->hwmods_cnt);
@@ -322,12 +321,11 @@ int omap_device_count_resources(struct omap_device *od)
  */
 int omap_device_fill_resources(struct omap_device *od, struct resource *res)
 {
-        struct omap_hwmod *oh;
         int c = 0;
         int i, r;
 
-        for (i = 0, oh = *od->hwmods; i < od->hwmods_cnt; i++, oh++) {
-                r = omap_hwmod_fill_resources(oh, res);
+        for (i = 0; i < od->hwmods_cnt; i++) {
+                r = omap_hwmod_fill_resources(od->hwmods[i], res);
                 res += r;
                 c += r;
         }
@@ -600,7 +598,6 @@ int omap_device_shutdown(struct platform_device *pdev)
 {
         int ret, i;
         struct omap_device *od;
-        struct omap_hwmod *oh;
 
         od = _find_by_pdev(pdev);
 
@@ -613,8 +610,8 @@ int omap_device_shutdown(struct platform_device *pdev)
 
         ret = _omap_device_deactivate(od, IGNORE_WAKEUP_LAT);
 
-        for (i = 0, oh = *od->hwmods; i < od->hwmods_cnt; i++, oh++)
-                omap_hwmod_shutdown(oh);
+        for (i = 0; i < od->hwmods_cnt; i++)
+                omap_hwmod_shutdown(od->hwmods[i]);
 
         od->_state = OMAP_DEVICE_STATE_SHUTDOWN;
 
@@ -714,11 +711,10 @@ void __iomem *omap_device_get_rt_va(struct omap_device *od)
  */
 int omap_device_enable_hwmods(struct omap_device *od)
 {
-        struct omap_hwmod *oh;
         int i;
 
-        for (i = 0, oh = *od->hwmods; i < od->hwmods_cnt; i++, oh++)
-                omap_hwmod_enable(oh);
+        for (i = 0; i < od->hwmods_cnt; i++)
+                omap_hwmod_enable(od->hwmods[i]);
 
         /* XXX pass along return value here? */
         return 0;
@@ -732,11 +728,10 @@ int omap_device_enable_hwmods(struct omap_device *od)
  */
 int omap_device_idle_hwmods(struct omap_device *od)
 {
-        struct omap_hwmod *oh;
         int i;
 
-        for (i = 0, oh = *od->hwmods; i < od->hwmods_cnt; i++, oh++)
-                omap_hwmod_idle(oh);
+        for (i = 0; i < od->hwmods_cnt; i++)
+                omap_hwmod_idle(od->hwmods[i]);
 
         /* XXX pass along return value here? */
         return 0;
@@ -751,11 +746,10 @@ int omap_device_idle_hwmods(struct omap_device *od)
  */
 int omap_device_disable_clocks(struct omap_device *od)
 {
-        struct omap_hwmod *oh;
         int i;
 
-        for (i = 0, oh = *od->hwmods; i < od->hwmods_cnt; i++, oh++)
-                omap_hwmod_disable_clocks(oh);
+        for (i = 0; i < od->hwmods_cnt; i++)
+                omap_hwmod_disable_clocks(od->hwmods[i]);
 
         /* XXX pass along return value here? */
         return 0;
@@ -770,11 +764,10 @@ int omap_device_disable_clocks(struct omap_device *od)
  */
 int omap_device_enable_clocks(struct omap_device *od)
 {
-        struct omap_hwmod *oh;
         int i;
 
-        for (i = 0, oh = *od->hwmods; i < od->hwmods_cnt; i++, oh++)
-                omap_hwmod_enable_clocks(oh);
+        for (i = 0; i < od->hwmods_cnt; i++)
+                omap_hwmod_enable_clocks(od->hwmods[i]);
 
         /* XXX pass along return value here? */
         return 0;