Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 308195
b: refs/heads/master
c: 822c250
h: refs/heads/master
i:
  308193: d1b4a16
  308191: c9d1fb4
v: v3
  • Loading branch information
Shawn Guo authored and Mike Turquette committed Apr 24, 2012
1 parent 8e09f40 commit db9f552
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c0d2530c03cbf3741cb7a0f8ebae93e7a563fc58
refs/heads/master: 822c250e154cd44cf60a4f0d647aa70abea09520
2 changes: 1 addition & 1 deletion trunk/drivers/clk/clk-divider.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ static int clk_divider_set_rate(struct clk_hw *hw, unsigned long rate)
return 0;
}

struct clk_ops clk_divider_ops = {
const struct clk_ops clk_divider_ops = {
.recalc_rate = clk_divider_recalc_rate,
.round_rate = clk_divider_round_rate,
.set_rate = clk_divider_set_rate,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/clk/clk-fixed-rate.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static unsigned long clk_fixed_rate_recalc_rate(struct clk_hw *hw,
return to_clk_fixed_rate(hw)->fixed_rate;
}

struct clk_ops clk_fixed_rate_ops = {
const struct clk_ops clk_fixed_rate_ops = {
.recalc_rate = clk_fixed_rate_recalc_rate,
};
EXPORT_SYMBOL_GPL(clk_fixed_rate_ops);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/clk/clk-gate.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ static int clk_gate_is_enabled(struct clk_hw *hw)
return reg ? 1 : 0;
}

struct clk_ops clk_gate_ops = {
const struct clk_ops clk_gate_ops = {
.enable = clk_gate_enable,
.disable = clk_gate_disable,
.is_enabled = clk_gate_is_enabled,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/clk/clk-mux.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static int clk_mux_set_parent(struct clk_hw *hw, u8 index)
return 0;
}

struct clk_ops clk_mux_ops = {
const struct clk_ops clk_mux_ops = {
.get_parent = clk_mux_get_parent,
.set_parent = clk_mux_set_parent,
};
Expand Down
8 changes: 4 additions & 4 deletions trunk/include/linux/clk-private.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ struct clk {
* alternative macro for static initialization
*/

extern struct clk_ops clk_fixed_rate_ops;
extern const struct clk_ops clk_fixed_rate_ops;

#define DEFINE_CLK_FIXED_RATE(_name, _flags, _rate, \
_fixed_rate_flags) \
Expand All @@ -78,7 +78,7 @@ extern struct clk_ops clk_fixed_rate_ops;
.flags = _flags, \
};

extern struct clk_ops clk_gate_ops;
extern const struct clk_ops clk_gate_ops;

#define DEFINE_CLK_GATE(_name, _parent_name, _parent_ptr, \
_flags, _reg, _bit_idx, \
Expand Down Expand Up @@ -110,7 +110,7 @@ extern struct clk_ops clk_gate_ops;
.flags = _flags, \
};

extern struct clk_ops clk_divider_ops;
extern const struct clk_ops clk_divider_ops;

#define DEFINE_CLK_DIVIDER(_name, _parent_name, _parent_ptr, \
_flags, _reg, _shift, _width, \
Expand Down Expand Up @@ -143,7 +143,7 @@ extern struct clk_ops clk_divider_ops;
.flags = _flags, \
};

extern struct clk_ops clk_mux_ops;
extern const struct clk_ops clk_mux_ops;

#define DEFINE_CLK_MUX(_name, _parent_names, _parents, _flags, \
_reg, _shift, _width, \
Expand Down

0 comments on commit db9f552

Please sign in to comment.