From: Mike Turquette <mturquette@linaro.org>
Date: Tue, 31 Dec 2013 19:35:12 +0000 (-0800)
Subject: Merge branch 'clk-next-unregister' into clk-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dbdf6ff51e3ce13ade5834b0d7d451522fcdb478;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'clk-next-unregister' into clk-next

Conflicts:
	drivers/clk/clk.c
---

dbdf6ff51e3ce13ade5834b0d7d451522fcdb478
diff --cc drivers/clk/clk.c
index b7f6e99e61eb,da7b33e4c5a2..e3e03270b95e
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@@ -1861,6 -1794,9 +1881,7 @@@ int __clk_init(struct device *dev, stru
  	if (clk->ops->init)
  		clk->ops->init(clk->hw);
  
 -	clk_debug_register(clk);
 -
+ 	kref_init(&clk->ref);
  out:
  	clk_prepare_unlock();
  
diff --cc include/linux/clk-private.h
index 5fb086b06c83,72c65e05450b..efbf70b9fd84
--- a/include/linux/clk-private.h
+++ b/include/linux/clk-private.h
@@@ -45,9 -48,10 +49,10 @@@ struct clk 
  	struct hlist_head	children;
  	struct hlist_node	child_node;
  	unsigned int		notifier_count;
 -#ifdef CONFIG_COMMON_CLK_DEBUG
 +#ifdef CONFIG_DEBUG_FS
  	struct dentry		*dentry;
  #endif
+ 	struct kref		ref;
  };
  
  /*