Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62f49ee2 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Krzysztof Kozlowski
Browse files

cpufreq: s3c24xx: Do not mark s3c2410_plls_add as __init 



s3c2410_plls_add is a device notifier that may be called at runtime and
is correctly not marked __init. However it calls s3c_plltab_register()
which is marked __init, and that triggers a build error when we are
checking for section mismatches:

WARNING: vmlinux.o(.text+0x195e0): Section mismatch in reference from the function s3c2410_plls_add() to the function .init.text:s3c_plltab_register()
The function s3c2410_plls_add() references
the function __init s3c_plltab_register().
This is often because s3c2410_plls_add lacks a __init
annotation or the annotation of s3c_plltab_register is wrong.

This removes the __init annotation from s3c2410_plls_add as well as the
__initdata section annotations from s3c2440_plls_12 and s3c2440_plls_169344,
which in turn are referenced from s3c2410_plls_add.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
parent ce36f6ad

arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <plat/cpu.h>

#include <plat/cpu-freq-core.h>



static struct cpufreq_frequency_table s3c2440_plls_12[] __initdata = {

static struct cpufreq_frequency_table s3c2440_plls_12[] = {

	{ .frequency = 75000000,	.driver_data = PLLVAL(0x75, 3, 3),  }, 	/* FVco 600.000000 */

	{ .frequency = 80000000,	.driver_data = PLLVAL(0x98, 4, 3),  }, 	/* FVco 640.000000 */

	{ .frequency = 90000000,	.driver_data = PLLVAL(0x70, 2, 3),  }, 	/* FVco 720.000000 */

arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <plat/cpu.h>

#include <plat/cpu-freq-core.h>



static struct cpufreq_frequency_table s3c2440_plls_169344[] __initdata = {

static struct cpufreq_frequency_table s3c2440_plls_169344[] = {

	{ .frequency = 78019200,	.driver_data = PLLVAL(121, 5, 3), 	}, 	/* FVco 624.153600 */

	{ .frequency = 84067200,	.driver_data = PLLVAL(131, 5, 3), 	}, 	/* FVco 672.537600 */

	{ .frequency = 90115200,	.driver_data = PLLVAL(141, 5, 3), 	}, 	/* FVco 720.921600 */

drivers/cpufreq/s3c24xx-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ late_initcall(s3c_cpufreq_initcall); 
 *

 * Register the given set of PLLs with the system.

 */

int __init s3c_plltab_register(struct cpufreq_frequency_table *plls,

int s3c_plltab_register(struct cpufreq_frequency_table *plls,

			       unsigned int plls_no)

{

	struct cpufreq_frequency_table *vals;