linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / arm / plat-omap / clock.c

diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index 7f45c7c..3c2bfc0 100644 (file)
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -11,6 +11,7 @@
  * published by the Free Software Foundation.
  */
 #include <linux/version.h>
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -20,16 +21,15 @@
 #include <linux/string.h>
 #include <linux/clk.h>
 #include <linux/mutex.h>
-#include <linux/platform_device.h>
 
 #include <asm/io.h>
 #include <asm/semaphore.h>
 
 #include <asm/arch/clock.h>
 
-static LIST_HEAD(clocks);
+LIST_HEAD(clocks);
 static DEFINE_MUTEX(clocks_mutex);
-static DEFINE_SPINLOCK(clockfw_lock);
+DEFINE_SPINLOCK(clockfw_lock);
 
 static struct clk_functions *arch_clock;
 
@@ -37,38 +37,17 @@ static struct clk_functions *arch_clock;
  * Standard clock functions defined in include/linux/clk.h
  *-------------------------------------------------------------------------*/
 
-/*
- * Returns a clock. Note that we first try to use device id on the bus
- * and clock name. If this fails, we try to use clock name only.
- */
 struct clk * clk_get(struct device *dev, const char *id)
 {
        struct clk *p, *clk = ERR_PTR(-ENOENT);
-       int idno;
-
-       if (dev == NULL || dev->bus != &platform_bus_type)
-               idno = -1;
-       else
-               idno = to_platform_device(dev)->id;
 
        mutex_lock(&clocks_mutex);
-
-       list_for_each_entry(p, &clocks, node) {
-               if (p->id == idno &&
-                   strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
-                       clk = p;
-                       goto found;
-               }
-       }
-
        list_for_each_entry(p, &clocks, node) {
                if (strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
                        clk = p;
                        break;
                }
        }
-
-found:
        mutex_unlock(&clocks_mutex);
 
        return clk;
@@ -80,9 +59,6 @@ int clk_enable(struct clk *clk)
        unsigned long flags;
        int ret = 0;
 
-       if (clk == NULL || IS_ERR(clk))
-               return -EINVAL;
-
        spin_lock_irqsave(&clockfw_lock, flags);
        if (arch_clock->clk_enable)
                ret = arch_clock->clk_enable(clk);
@@ -96,9 +72,6 @@ void clk_disable(struct clk *clk)
 {
        unsigned long flags;
 
-       if (clk == NULL || IS_ERR(clk))
-               return;
-
        spin_lock_irqsave(&clockfw_lock, flags);
        if (arch_clock->clk_disable)
                arch_clock->clk_disable(clk);
@@ -111,9 +84,6 @@ int clk_get_usecount(struct clk *clk)
        unsigned long flags;
        int ret = 0;
 
-       if (clk == NULL || IS_ERR(clk))
-               return 0;
-
        spin_lock_irqsave(&clockfw_lock, flags);
        ret = clk->usecount;
        spin_unlock_irqrestore(&clockfw_lock, flags);
@@ -127,9 +97,6 @@ unsigned long clk_get_rate(struct clk *clk)
        unsigned long flags;
        unsigned long ret = 0;
 
-       if (clk == NULL || IS_ERR(clk))
-               return 0;
-
        spin_lock_irqsave(&clockfw_lock, flags);
        ret = clk->rate;
        spin_unlock_irqrestore(&clockfw_lock, flags);
@@ -154,9 +121,6 @@ long clk_round_rate(struct clk *clk, unsigned long rate)
        unsigned long flags;
        long ret = 0;
 
-       if (clk == NULL || IS_ERR(clk))
-               return ret;
-
        spin_lock_irqsave(&clockfw_lock, flags);
        if (arch_clock->clk_round_rate)
                ret = arch_clock->clk_round_rate(clk, rate);
@@ -169,10 +133,7 @@ EXPORT_SYMBOL(clk_round_rate);
 int clk_set_rate(struct clk *clk, unsigned long rate)
 {
        unsigned long flags;
-       int ret = -EINVAL;
-
-       if (clk == NULL || IS_ERR(clk))
-               return ret;
+       int ret = 0;
 
        spin_lock_irqsave(&clockfw_lock, flags);
        if (arch_clock->clk_set_rate)
@@ -186,10 +147,7 @@ EXPORT_SYMBOL(clk_set_rate);
 int clk_set_parent(struct clk *clk, struct clk *parent)
 {
        unsigned long flags;
-       int ret = -EINVAL;
-
-       if (clk == NULL || IS_ERR(clk) || parent == NULL || IS_ERR(parent))
-               return ret;
+       int ret = 0;
 
        spin_lock_irqsave(&clockfw_lock, flags);
        if (arch_clock->clk_set_parent)
@@ -205,9 +163,6 @@ struct clk *clk_get_parent(struct clk *clk)
        unsigned long flags;
        struct clk * ret = NULL;
 
-       if (clk == NULL || IS_ERR(clk))
-               return ret;
-
        spin_lock_irqsave(&clockfw_lock, flags);
        if (arch_clock->clk_get_parent)
                ret = arch_clock->clk_get_parent(clk);
@@ -244,9 +199,6 @@ __setup("mpurate=", omap_clk_setup);
 /* Used for clocks that always have same value as the parent clock */
 void followparent_recalc(struct clk *clk)
 {
-       if (clk == NULL || IS_ERR(clk))
-               return;
-
        clk->rate = clk->parent->rate;
 }
 
@@ -255,9 +207,6 @@ void propagate_rate(struct clk * tclk)
 {
        struct clk *clkp;
 
-       if (tclk == NULL || IS_ERR(tclk))
-               return;
-
        list_for_each_entry(clkp, &clocks, node) {
                if (likely(clkp->parent != tclk))
                        continue;
@@ -268,9 +217,6 @@ void propagate_rate(struct clk * tclk)
 
 int clk_register(struct clk *clk)
 {
-       if (clk == NULL || IS_ERR(clk))
-               return -EINVAL;
-
        mutex_lock(&clocks_mutex);
        list_add(&clk->node, &clocks);
        if (clk->init)
@@ -283,9 +229,6 @@ EXPORT_SYMBOL(clk_register);
 
 void clk_unregister(struct clk *clk)
 {
-       if (clk == NULL || IS_ERR(clk))
-               return;
-
        mutex_lock(&clocks_mutex);
        list_del(&clk->node);
        mutex_unlock(&clocks_mutex);
@@ -296,9 +239,6 @@ void clk_deny_idle(struct clk *clk)
 {
        unsigned long flags;
 
-       if (clk == NULL || IS_ERR(clk))
-               return;
-
        spin_lock_irqsave(&clockfw_lock, flags);
        if (arch_clock->clk_deny_idle)
                arch_clock->clk_deny_idle(clk);
@@ -310,9 +250,6 @@ void clk_allow_idle(struct clk *clk)
 {
        unsigned long flags;
 
-       if (clk == NULL || IS_ERR(clk))
-               return;
-
        spin_lock_irqsave(&clockfw_lock, flags);
        if (arch_clock->clk_allow_idle)
                arch_clock->clk_allow_idle(clk);