From: Magnus Damm <damm@opensource.se>
Date: Wed, 29 Feb 2012 13:18:19 +0000 (+0900)
Subject: sh: remove clk_ops
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=84c36ffd7c580e1a63d7284e318670b082260118;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

sh: remove clk_ops

Now when all clk_ops have been renamed it is
safe to rename clk_ops to sh_clk_ops.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---

diff --git a/include/linux/sh_clk.h b/include/linux/sh_clk.h
index 706c005cd4ba..0a9d8f2ac519 100644
--- a/include/linux/sh_clk.h
+++ b/include/linux/sh_clk.h
@@ -18,9 +18,8 @@ struct clk_mapping {
 	struct kref		ref;
 };
 
-#define sh_clk_ops clk_ops
 
-struct clk_ops {
+struct sh_clk_ops {
 #ifdef CONFIG_SH_CLK_CPG_LEGACY
 	void (*init)(struct clk *clk);
 #endif
@@ -39,7 +38,7 @@ struct clk {
 	unsigned short		parent_num;	/* choose between */
 	unsigned char		src_shift;	/* source clock field in the */
 	unsigned char		src_width;	/* configuration register */
-	struct clk_ops		*ops;
+	struct sh_clk_ops	*ops;
 
 	struct list_head	children;
 	struct list_head	sibling;	/* node for children */