---

yaml
---
r: 137301
b: refs/heads/master
c: 2b811bb
h: refs/heads/master
i:
  137299: 9d27a7f
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44dc9d027f1cb56625b1011d8725d2ab614c04e6
+refs/heads/master: 2b811bb56a008f0f669a1bd82e4d077e75aa059a

trunk/arch/arm/plat-omap/clock.c

@@ -36,45 +36,6 @@ static struct clk_functions *arch_clock;
  * Standard clock functions defined in include/linux/clk.h
  *-------------------------------------------------------------------------*/
 
-#ifndef CONFIG_COMMON_CLKDEV
-/*
- * 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) {
-			clk = p;
-			goto found;
-		}
-	}
-
-	list_for_each_entry(p, &clocks, node) {
-		if (strcmp(id, p->name) == 0) {
-			clk = p;
-			break;
-		}
-	}
-
-found:
-	mutex_unlock(&clocks_mutex);
-
-	return clk;
-}
-EXPORT_SYMBOL(clk_get);
-#endif
-
 int clk_enable(struct clk *clk)
 {
 	unsigned long flags;
@@ -147,13 +108,6 @@ unsigned long clk_get_rate(struct clk *clk)
 }
 EXPORT_SYMBOL(clk_get_rate);
 
-#ifndef CONFIG_COMMON_CLKDEV
-void clk_put(struct clk *clk)
-{
-}
-EXPORT_SYMBOL(clk_put);
-#endif
-
 /*-------------------------------------------------------------------------
  * Optional clock functions defined in include/linux/clk.h
  *-------------------------------------------------------------------------*/