|
|
@@ -2,19 +2,19 @@
|
|
|
+++ b/drivers/clk/at91/clk-usb.c
|
|
|
@@ -59,7 +59,7 @@ static unsigned long at91sam9x5_clk_usb_
|
|
|
static long at91sam9x5_clk_usb_determine_rate(struct clk_hw *hw,
|
|
|
- unsigned long rate,
|
|
|
- unsigned long *best_parent_rate,
|
|
|
-- struct clk_hw **best_parent_hw)
|
|
|
-+ struct clk **best_parent_clk)
|
|
|
+ unsigned long rate,
|
|
|
+ unsigned long *best_parent_rate,
|
|
|
+- struct clk_hw **best_parent_hw)
|
|
|
++ struct clk **best_parent_clk)
|
|
|
{
|
|
|
- struct clk *parent = NULL;
|
|
|
- long best_rate = -EINVAL;
|
|
|
+ struct clk *parent = NULL;
|
|
|
+ long best_rate = -EINVAL;
|
|
|
@@ -91,7 +91,7 @@ static long at91sam9x5_clk_usb_determine
|
|
|
- best_rate = tmp_rate;
|
|
|
- best_diff = tmp_diff;
|
|
|
- *best_parent_rate = tmp_parent_rate;
|
|
|
-- *best_parent_hw = __clk_get_hw(parent);
|
|
|
-+ *best_parent_clk = parent;
|
|
|
- }
|
|
|
-
|
|
|
- if (!best_diff || tmp_rate < rate)
|
|
|
+ best_rate = tmp_rate;
|
|
|
+ best_diff = tmp_diff;
|
|
|
+ *best_parent_rate = tmp_parent_rate;
|
|
|
+- *best_parent_hw = __clk_get_hw(parent);
|
|
|
++ *best_parent_clk = parent;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!best_diff || tmp_rate < rate)
|