From: Jonghwan Choi Date: Tue, 23 Aug 2011 07:08:06 +0000 (+0900) Subject: ARM: S5P: Remove duplicate kdiv calculation X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=481411568062e1ab4424e6021e9ec500eaefc4ac;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git ARM: S5P: Remove duplicate kdiv calculation Signed-off-by: Jonghwan Choi Signed-off-by: Kukjin Kim --- diff --git a/arch/arm/plat-s5p/include/plat/pll.h b/arch/arm/plat-s5p/include/plat/pll.h index bf28fadee7ae..ebc142c5c84c 100644 --- a/arch/arm/plat-s5p/include/plat/pll.h +++ b/arch/arm/plat-s5p/include/plat/pll.h @@ -72,7 +72,6 @@ static inline unsigned long s5p_get_pll46xx(unsigned long baseclk, mdiv = (pll_con0 >> PLL46XX_MDIV_SHIFT) & PLL46XX_MDIV_MASK; pdiv = (pll_con0 >> PLL46XX_PDIV_SHIFT) & PLL46XX_PDIV_MASK; sdiv = (pll_con0 >> PLL46XX_SDIV_SHIFT) & PLL46XX_SDIV_MASK; - kdiv = pll_con1 & PLL46XX_KDIV_MASK; if (pll_type == pll_4650c) kdiv = pll_con1 & PLL4650C_KDIV_MASK;