sh: remove clk_ops
authorMagnus Damm <damm@opensource.se>
Wed, 29 Feb 2012 13:18:19 +0000 (22:18 +0900)
committerRafael J. Wysocki <rjw@sisk.pl>
Mon, 12 Mar 2012 21:19:13 +0000 (22:19 +0100)
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>
include/linux/sh_clk.h

index 706c005cd4ba470398aa032ff6a8bd25c1cfe445..0a9d8f2ac51908958776115b8d1ff5d2cbbc5b6d 100644 (file)
@@ -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 */