summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto2012-05-07 03:12:41 +0200
committerRafael J. Wysocki2012-05-12 22:24:50 +0200
commitc8241085e8606a14ef48e6d99556133c48aaddaf (patch)
tree37bb00670ce883f1868dc688eb86086b89f95eca
parentARM: mach-shmobile: clock-r8a7740: add MMCIF clock (diff)
downloadkernel-qcow2-linux-c8241085e8606a14ef48e6d99556133c48aaddaf.tar.gz
kernel-qcow2-linux-c8241085e8606a14ef48e6d99556133c48aaddaf.tar.xz
kernel-qcow2-linux-c8241085e8606a14ef48e6d99556133c48aaddaf.zip
ARM: mach-shmobile: clock-r8a7740: use followparent_recalc on usb24s
If the clocks is always same value as the parent clock, we can use followparent_recalc() for .recalc Reported-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Reviewed-by: Simon Horman <horms@verge.net.au> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r--arch/arm/mach-shmobile/clock-r8a7740.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c
index 89a2f9dad3b3..81b54a6af20f 100644
--- a/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/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,