diff options
author | Tushar Behera <tushar.behera@linaro.org> | 2012-03-01 09:42:53 +0530 |
---|---|---|
committer | Tushar Behera <tushar.behera@linaro.org> | 2012-03-01 10:22:19 +0530 |
commit | b7b701da750495c185879299a8ff1df93ebb7ddf (patch) | |
tree | 3a8a36333334a86367dc80500742fea4e7744cce | |
parent | 1a80682468d657b373a4f528a48caff5e0675e70 (diff) |
ARM: SAMSUNG: Add __init attribute to functions calling s3c_set_platdatasamsung-lt-v3.3-rc5
The function s3c_set_platdata is defined with __init attribute, hence the
functions calling s3c_set_platdata should also be defined with __init
attribute.
Even though all the modified functions are called from xxx_machine_init()
functions, it is still better to define each of them with __init attribute.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
-rw-r--r-- | arch/arm/mach-exynos/mach-nuri.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-universal_c210.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-samsung/dev-backlight.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-samsung/devs.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c index 9b6b698f13a7..e9924a3f777a 100644 --- a/arch/arm/mach-exynos/mach-nuri.c +++ b/arch/arm/mach-exynos/mach-nuri.c @@ -1260,7 +1260,7 @@ static struct gpio nuri_camera_gpios[] = { { GPIO_CAM_MEGA_RST, GPIOF_OUT_INIT_LOW, "CAM_8M_NRST" }, }; -static void nuri_camera_init(void) +static void __init nuri_camera_init(void) { s3c_set_platdata(&mipi_csis_platdata, sizeof(mipi_csis_platdata), &s5p_device_mipi_csis0); diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c index 8a414048e6fd..77f487001683 100644 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c @@ -994,7 +994,7 @@ static struct gpio universal_camera_gpios[] = { /* USB OTG */ static struct s3c_hsotg_plat universal_hsotg_pdata; -static void universal_camera_init(void) +static void __init universal_camera_init(void) { s3c_set_platdata(&mipi_csis_platdata, sizeof(mipi_csis_platdata), &s5p_device_mipi_csis0); diff --git a/arch/arm/plat-samsung/dev-backlight.c b/arch/arm/plat-samsung/dev-backlight.c index 2254920a02cf..5f197dcaf10c 100644 --- a/arch/arm/plat-samsung/dev-backlight.c +++ b/arch/arm/plat-samsung/dev-backlight.c @@ -77,7 +77,7 @@ static struct platform_device samsung_dfl_bl_device __initdata = { * @gpio_info: structure containing GPIO info for PWM timer * @bl_data: structure containing Backlight control data */ -void samsung_bl_set(struct samsung_bl_gpio_info *gpio_info, +void __init samsung_bl_set(struct samsung_bl_gpio_info *gpio_info, struct platform_pwm_backlight_data *bl_data) { int ret = 0; diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 397cff2f9c2f..634835cf34a9 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -797,7 +797,7 @@ struct platform_device s3c_device_cfcon = { .resource = s3c_cfcon_resource, }; -void s3c_ide_set_platdata(struct s3c_ide_platdata *pdata) +void __init s3c_ide_set_platdata(struct s3c_ide_platdata *pdata) { s3c_set_platdata(pdata, sizeof(struct s3c_ide_platdata), &s3c_device_cfcon); @@ -1077,7 +1077,7 @@ struct platform_device s3c64xx_device_onenand1 = { .resource = s3c64xx_onenand1_resources, }; -void s3c64xx_onenand1_set_platdata(struct onenand_platform_data *pdata) +void __init s3c64xx_onenand1_set_platdata(struct onenand_platform_data *pdata) { s3c_set_platdata(pdata, sizeof(struct onenand_platform_data), &s3c64xx_device_onenand1); |