Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@free-electrons.com>2015-05-07 11:56:44 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-11 05:34:02 -0700
commit99be73b75fa9bb77d68c120255d81bba0f0fc427 (patch)
tree7e96b0fca02e89c770d19a67fa2f0b47ab842f94
parent61815444fa0b437cd2b7a2be781a10773801e72e (diff)
clk: at91: usb: fix determine_rate prototype
Commit c67881fc890916206e723329e774391c6ed354ce is a backport of 0b67c43ce36a9964f1d5e3f973ee19eefd3f9f8f upstream commit, fixing a bug on clk rate change propagation. But in 4.0 ->determine_rate() prototype has changed, thus introducing a prototype mismatch when applying it on 3.19. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/clk/at91/clk-usb.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c
index 0b7c3e8840ba..0283a5713d6c 100644
--- a/drivers/clk/at91/clk-usb.c
+++ b/drivers/clk/at91/clk-usb.c
@@ -58,8 +58,6 @@ static unsigned long at91sam9x5_clk_usb_recalc_rate(struct clk_hw *hw,
static long at91sam9x5_clk_usb_determine_rate(struct clk_hw *hw,
unsigned long rate,
- unsigned long min_rate,
- unsigned long max_rate,
unsigned long *best_parent_rate,
struct clk_hw **best_parent_hw)
{