From: Olof Johansson Date: Wed, 7 Mar 2012 22:45:28 +0000 (-0800) Subject: Merge branch 'next/cleanup-use-static' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=62f383435932ea3d271bee6b957de048452c1b16;hp=-c;p=deliverable%2Flinux.git Merge branch 'next/cleanup-use-static' of git://git./linux/kernel/git/kgene/linux-samsung into next/cleanup * 'next/cleanup-use-static' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: SAMSUNG: use static declaration when it is not used in other files ARM: S5PV210: use static declaration when it is not used in other files ARM: S5PC100: use static declaration when it is not used in other files ARM: S5P64X0: use static declaration when it is not used in other files ARM: S3C64XX: use static declaration when it is not used in other files ARM: S3C24XX: use static declaration when it is not used in other files ARM: EXYNOS: use static declaration when it is not used in other files --- 62f383435932ea3d271bee6b957de048452c1b16 diff --combined arch/arm/mach-exynos/clock-exynos4210.c index 13312ccb2d93,25ea4002f400..54a92efcf5b1 --- a/arch/arm/mach-exynos/clock-exynos4210.c +++ b/arch/arm/mach-exynos/clock-exynos4210.c @@@ -32,7 -32,6 +32,7 @@@ #include "common.h" +#ifdef CONFIG_PM_SLEEP static struct sleep_save exynos4210_clock_save[] = { SAVE_ITEM(S5P_CLKSRC_IMAGE), SAVE_ITEM(S5P_CLKSRC_LCD1), @@@ -43,7 -42,6 +43,7 @@@ SAVE_ITEM(S5P_CLKGATE_IP_LCD1), SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4210), }; +#endif static struct clksrc_clk *sysclks[] = { /* nothing here yet */ @@@ -117,7 -115,7 +117,7 @@@ static void exynos4210_clock_resume(voi #define exynos4210_clock_resume NULL #endif - struct syscore_ops exynos4210_clock_syscore_ops = { + static struct syscore_ops exynos4210_clock_syscore_ops = { .suspend = exynos4210_clock_suspend, .resume = exynos4210_clock_resume, }; diff --combined arch/arm/mach-exynos/clock-exynos4212.c index 48af28566fa1,b133f8615c52..8e07ab13ff19 --- a/arch/arm/mach-exynos/clock-exynos4212.c +++ b/arch/arm/mach-exynos/clock-exynos4212.c @@@ -32,14 -32,12 +32,14 @@@ #include "common.h" +#ifdef CONFIG_PM_SLEEP static struct sleep_save exynos4212_clock_save[] = { SAVE_ITEM(S5P_CLKSRC_IMAGE), SAVE_ITEM(S5P_CLKDIV_IMAGE), SAVE_ITEM(S5P_CLKGATE_IP_IMAGE_4212), SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4212), }; +#endif static struct clk *clk_src_mpll_user_list[] = { [0] = &clk_fin_mpll, @@@ -89,7 -87,7 +89,7 @@@ static void exynos4212_clock_resume(voi #define exynos4212_clock_resume NULL #endif - struct syscore_ops exynos4212_clock_syscore_ops = { + static struct syscore_ops exynos4212_clock_syscore_ops = { .suspend = exynos4212_clock_suspend, .resume = exynos4212_clock_resume, }; diff --combined arch/arm/mach-exynos/clock.c index 187287aa57ab,c07c6d4bcecd..200874e82dcd --- a/arch/arm/mach-exynos/clock.c +++ b/arch/arm/mach-exynos/clock.c @@@ -30,7 -30,6 +30,7 @@@ #include "common.h" +#ifdef CONFIG_PM_SLEEP static struct sleep_save exynos4_clock_save[] = { SAVE_ITEM(S5P_CLKDIV_LEFTBUS), SAVE_ITEM(S5P_CLKGATE_IP_LEFTBUS), @@@ -94,7 -93,6 +94,7 @@@ SAVE_ITEM(S5P_CLKGATE_SCLKCPU), SAVE_ITEM(S5P_CLKGATE_IP_CPU), }; +#endif struct clk clk_sclk_hdmi27m = { .name = "sclk_hdmi27m", @@@ -1526,7 -1524,7 +1526,7 @@@ static void exynos4_clock_resume(void #define exynos4_clock_resume NULL #endif - struct syscore_ops exynos4_clock_syscore_ops = { + static struct syscore_ops exynos4_clock_syscore_ops = { .suspend = exynos4_clock_suspend, .resume = exynos4_clock_resume, }; diff --combined arch/arm/mach-exynos/mach-universal_c210.c index 0fc65ffde8ff,29c8e188d8e7..e00d8e26d525 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c @@@ -910,7 -910,7 +910,7 @@@ static struct s5p_fimc_isp_info univers .bus_type = FIMC_MIPI_CSI2, .board_info = &m5mols_board_info, .i2c_bus_num = 0, - .clk_frequency = 21600000UL, + .clk_frequency = 24000000UL, .csi_data_align = 32, }, }; @@@ -997,7 -997,7 +997,7 @@@ static void __init universal_map_io(voi s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs)); } - void s5p_tv_setup(void) + static void s5p_tv_setup(void) { /* direct HPD to HDMI chip */ gpio_request_one(EXYNOS4_GPX3(7), GPIOF_IN, "hpd-plug"); diff --combined arch/arm/plat-samsung/devs.c index f10768e988d4,eddb0ebac585..98b864777a31 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@@ -468,10 -468,8 +468,10 @@@ void __init s3c_i2c0_set_platdata(struc { struct s3c2410_platform_i2c *npd; - if (!pd) + if (!pd) { pd = &default_i2c_data; + pd->bus_num = 0; + } npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c), &s3c_device_i2c0); @@@ -744,17 -742,6 +744,6 @@@ struct platform_device s3c_device_iis }; #endif /* CONFIG_PLAT_S3C24XX */ - #ifdef CONFIG_CPU_S3C2440 - struct platform_device s3c2412_device_iis = { - .name = "s3c2412-iis", - .id = -1, - .dev = { - .dma_mask = &samsung_device_dma_mask, - .coherent_dma_mask = DMA_BIT_MASK(32), - } - }; - #endif /* CONFIG_CPU_S3C2440 */ - /* IDE CFCON */ #ifdef CONFIG_SAMSUNG_DEV_IDE @@@ -1078,7 -1065,7 +1067,7 @@@ static struct resource s5p_pmu_resource DEFINE_RES_IRQ(IRQ_PMU) }; - struct platform_device s5p_device_pmu = { + static struct platform_device s5p_device_pmu = { .name = "arm-pmu", .id = ARM_PMU_DEVICE_CPU, .num_resources = ARRAY_SIZE(s5p_pmu_resource),