From 253f2e4d4ada5a3f25b1ec32698fc53f22efd313 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Sun, 6 May 2012 18:12:41 -0700 Subject: [PATCH] --- yaml --- r: 303267 b: refs/heads/master c: c8241085e8606a14ef48e6d99556133c48aaddaf h: refs/heads/master i: 303265: 7fd7b5e6e0a3876279e05124ed442b37f342d91f 303263: c1d300f36572f20b0eced5fb939815e6382dc8d8 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/clock-r8a7740.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1db5abb07a73..d33f83439d84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2c2d7e9210c4a82336b208adc88630cd0e77f57 +refs/heads/master: c8241085e8606a14ef48e6d99556133c48aaddaf diff --git a/trunk/arch/arm/mach-shmobile/clock-r8a7740.c b/trunk/arch/arm/mach-shmobile/clock-r8a7740.c index 89a2f9dad3b3..81b54a6af20f 100644 --- a/trunk/arch/arm/mach-shmobile/clock-r8a7740.c +++ b/trunk/arch/arm/mach-shmobile/clock-r8a7740.c @@ -188,11 +188,6 @@ static struct clk *usb24s_parents[] = { [1] = &extal2_clk }; -static unsigned long usb24s_recalc(struct clk *clk) -{ - return clk->parent->rate; -}; - static int usb24s_enable(struct clk *clk) { __raw_writel(__raw_readl(USBCKCR) & ~(1 << 8), USBCKCR); @@ -234,7 +229,7 @@ static int usb24s_set_parent(struct clk *clk, struct clk *parent) } static struct sh_clk_ops usb24s_clk_ops = { - .recalc = usb24s_recalc, + .recalc = followparent_recalc, .enable = usb24s_enable, .disable = usb24s_disable, .set_parent = usb24s_set_parent,