ARM:S3C2440: MINI2440 Remove some improper __initdata qualifiers
Subsystems (2)
PATCH 1/1 ARM:S3C2440: MINI2440 Remove some improper __initdata qualifiers
Hi,all
Since 2.6.31-rc7 released on Aug 22, someone used mini-2440 mach may find that some device worked improperly and especailly when the machine power off, some panic message showed up. After some debug work, I found the bug is caused by the improper __initdata qualifier on some device drivers. I visted the mini2440 webpage and found Michel Pollet had just patched for the bug on that day[1].
[1]
http://repo.or.cz/w/linux-2.6/mini2440.git?a=commitdiff;h=e575112de40df34936dbeac1699efc270231a40e
The patch[1] given by Michel is not for the mainline but for his development tree, so the patch can't be applied directly for the mainline. Two months has gone, the bug still exsits in the mainline, so I created a new patch based on 2.6.32-rc5. The patch has been tested on my mini2440 board.
Best Regards,
Shine
------------------------------------------------------
arch/arm/mach-s3c2440/mach-mini2440.c +29 -29
@@ -61,7 +61,7 @@#define MACH_MINI2440_DM9K_BASE (S3C2410_CS4 + 0x300) -static struct map_desc mini2440_iodesc[]__initdata = { +static struct map_desc mini2440_iodesc[] = {/* nothing to declare, move along */ };
@@ -70,7 +70,7 @@#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE -static struct s3c2410_uartcfg mini2440_uartcfgs[]__initdata = { +static struct s3c2410_uartcfg mini2440_uartcfgs[] = { [0 ] = { .hwport =0 , .flags =0 ,
@@ -114,7 +114,7 @@ } } -static struct s3c2410_udc_mach_info mini2440_udc_cfg__initdata = { +static struct s3c2410_udc_mach_info mini2440_udc_cfg = { .udc_command = mini2440_udc_pullup, };
@@ -144,7 +144,7 @@ .type = (S3C2410_LCDCON1_TFT16BPP |\ S3C2410_LCDCON1_TFT) -struct s3c2410fb_display mini2440_lcd_cfg[]__initdata = { +struct s3c2410fb_display mini2440_lcd_cfg[] = { [0 ] = {/* mini2440 + 3.5" TFT + touchscreen */ _LCD_DECLARE( 7, /* The 3.5 is quite fast */
@@ -191,7 +191,7 @@#define S3C2410_GPCCON_MASK (x) (3 << ((x) * 2))#define S3C2410_GPDCON_MASK (x) (3 << ((x) * 2)) -struct s3c2410fb_mach_info mini2440_fb_info__initdata = { +struct s3c2410fb_mach_info mini2440_fb_info = { .displays = &mini2440_lcd_cfg[0 ],/* not constant! see init */ .num_displays =1 , .default_display =0 ,
@@ -233,7 +233,7 @@/* MMC/SD */ -static struct s3c24xx_mci_pdata mini2440_mmc_cfg__initdata = { +static struct s3c24xx_mci_pdata mini2440_mmc_cfg = { .gpio_detect =S3C2410_GPG (8 ), .gpio_wprotect =S3C2410_GPH (8 ), .set_power =NULL ,
@@ -242,7 +242,7 @@/* NAND Flash on MINI2440 board */ -static struct mtd_partition mini2440_default_nand_part[]__initdata = { +static struct mtd_partition mini2440_default_nand_part[] = { [0 ] = { .name ="u-boot" , .size =SZ_256K ,
@@ -267,7 +267,7 @@ }, }; -static struct s3c2410_nand_set mini2440_nand_sets[]__initdata = { +static struct s3c2410_nand_set mini2440_nand_sets[] = { [0 ] = { .name ="nand" , .nr_chips =1 ,
@@ -277,7 +277,7 @@ }, }; -static struct s3c2410_platform_nand mini2440_nand_info__initdata = { +static struct s3c2410_platform_nand mini2440_nand_info = { .tacls =0 , .twrph0 =25 , .twrph1 =15 ,
@@ -288,7 +288,7 @@/* DM9000AEP 10/100 ethernet controller */ -static struct resource mini2440_dm9k_resource[]__initdata = { +static struct resource mini2440_dm9k_resource[] = { [0 ] = { .start =MACH_MINI2440_DM9K_BASE , .end =MACH_MINI2440_DM9K_BASE +3 ,
@@ -310,11 +310,11 @@* The DM9000 has no eeprom, and it's MAC address is set by * the bootloader before starting the kernel. */ -static struct dm9000_plat_data mini2440_dm9k_pdata__initdata = { +static struct dm9000_plat_data mini2440_dm9k_pdata = { .flags = (DM9000_PLATF_16BITONLY |DM9000_PLATF_NO_EEPROM ), }; -static struct platform_device mini2440_device_eth__initdata = { +static struct platform_device mini2440_device_eth = { .name ="dm9000" , .id =-1 , .num_resources =ARRAY_SIZE (mini2440_dm9k_resource),
@@ -341,7 +341,7 @@* | | +----+ +----+ * ..... */ -static struct gpio_keys_button mini2440_buttons[]__initdata = { +static struct gpio_keys_button mini2440_buttons[] = { { .gpio =S3C2410_GPG (0 ),/* K1 */ .code =KEY_F1 ,
@@ -384,12 +384,12 @@#endif }; -static struct gpio_keys_platform_data mini2440_button_data__initdata = { +static struct gpio_keys_platform_data mini2440_button_data = { .buttons = mini2440_buttons, .nbuttons =ARRAY_SIZE (mini2440_buttons), }; -static struct platform_device mini2440_button_device__initdata = { +static struct platform_device mini2440_button_device = { .name ="gpio-keys" , .id =-1 , .dev = {
@@ -399,41 +399,41 @@/* LEDS */ -static struct s3c24xx_led_platdata mini2440_led1_pdata__initdata = { +static struct s3c24xx_led_platdata mini2440_led1_pdata = { .name ="led1" , .gpio =S3C2410_GPB (5 ), .flags =S3C24XX_LEDF_ACTLOW |S3C24XX_LEDF_TRISTATE , .def_trigger ="heartbeat" , }; -static struct s3c24xx_led_platdata mini2440_led2_pdata__initdata = { +static struct s3c24xx_led_platdata mini2440_led2_pdata = { .name ="led2" , .gpio =S3C2410_GPB (6 ), .flags =S3C24XX_LEDF_ACTLOW |S3C24XX_LEDF_TRISTATE , .def_trigger ="nand-disk" , }; -static struct s3c24xx_led_platdata mini2440_led3_pdata__initdata = { +static struct s3c24xx_led_platdata mini2440_led3_pdata = { .name ="led3" , .gpio =S3C2410_GPB (7 ), .flags =S3C24XX_LEDF_ACTLOW |S3C24XX_LEDF_TRISTATE , .def_trigger ="mmc0" , }; -static struct s3c24xx_led_platdata mini2440_led4_pdata__initdata = { +static struct s3c24xx_led_platdata mini2440_led4_pdata = { .name ="led4" , .gpio =S3C2410_GPB (8 ), .flags =S3C24XX_LEDF_ACTLOW |S3C24XX_LEDF_TRISTATE , .def_trigger ="" , }; -static struct s3c24xx_led_platdata mini2440_led_backlight_pdata__initdata = { +static struct s3c24xx_led_platdata mini2440_led_backlight_pdata = { .name ="backlight" , .gpio =S3C2410_GPG (4 ), .def_trigger ="backlight" , }; -static struct platform_device mini2440_led1__initdata = { +static struct platform_device mini2440_led1 = { .name ="s3c24xx_led" , .id =1 , .dev = {
@@ -441,7 +441,7 @@ }, }; -static struct platform_device mini2440_led2__initdata = { +static struct platform_device mini2440_led2 = { .name ="s3c24xx_led" , .id =2 , .dev = {
@@ -449,7 +449,7 @@ }, }; -static struct platform_device mini2440_led3__initdata = { +static struct platform_device mini2440_led3 = { .name ="s3c24xx_led" , .id =3 , .dev = {
@@ -457,7 +457,7 @@ }, }; -static struct platform_device mini2440_led4__initdata = { +static struct platform_device mini2440_led4 = { .name ="s3c24xx_led" , .id =4 , .dev = {
@@ -465,7 +465,7 @@ }, }; -static struct platform_device mini2440_led_backlight__initdata = { +static struct platform_device mini2440_led_backlight = { .name ="s3c24xx_led" , .id =5 , .dev = {
@@ -475,14 +475,14 @@/* AUDIO */ -static struct s3c24xx_uda134x_platform_data mini2440_audio_pins__initdata = { +static struct s3c24xx_uda134x_platform_data mini2440_audio_pins = { .l3_clk =S3C2410_GPB (4 ), .l3_mode =S3C2410_GPB (2 ), .l3_data =S3C2410_GPB (3 ), .model =UDA134X_UDA1341 }; -static struct platform_device mini2440_audio__initdata = { +static struct platform_device mini2440_audio = { .name ="s3c24xx_uda134x" , .id =0 , .dev = {
@@ -498,14 +498,14 @@ .page_size = 16, }; -static struct i2c_board_info mini2440_i2c_devs[]__initdata = { +static struct i2c_board_info mini2440_i2c_devs[] = { {I2C_BOARD_INFO ("24c08" ,0x50 ), .platform_data = &at24c08, }, }; -static struct platform_device *mini2440_devices[]__initdata = { +static struct platform_device *mini2440_devices[] = { &s3c_device_usb, &s3c_device_wdt,/* &s3c_device_adc,*/ /* ADC doesn't like living with touchscreen ! */
PATCH 1/1 ARM:S3C2440: MINI2440 Remove some improper __initdata qualifiers
Quoted 11 lines · Shine Liu
[...]
Quoted 1 line
(quoted diff) +0
-0@@ -144,7 +144,7 @@arch/arm/mach-s3c2440/mach-mini2440.c +1
-1.type = (S3C2410_LCDCON1_TFT16BPP |\ S3C2410_LCDCON1_TFT) -struct s3c2410fb_display mini2440_lcd_cfg[]__initdata = { +struct s3c2410fb_display mini2440_lcd_cfg[] = { [0 ] = {/* mini2440 + 3.5" TFT + touchscreen */ _LCD_DECLARE( 7, /* The 3.5 is quite fast */
arch/arm/mach-s3c2440/mach-mini2440.c line 197
Quoted 8 lines
arch/arm/mach-s3c2440/mach-mini2440.c +1
-1@@ -191,7 +191,7 @@#define S3C2410_GPCCON_MASK (x) (3 << ((x) * 2))#define S3C2410_GPDCON_MASK (x) (3 << ((x) * 2)) -struct s3c2410fb_mach_info mini2440_fb_info__initdata = { +struct s3c2410fb_mach_info mini2440_fb_info = { .displays = &mini2440_lcd_cfg[0 ],/* not constant! see init */ .num_displays =1 , .default_display =0 ,
But the other implementations in this directory are also using __initdata for these structures. Do they also need to remove the __initdata?
Quoted 5 lines
[...]
arch/arm/mach-s3c2440/mach-mini2440.c +0
-0@@ -498,14 +498,14 @@ .page_size = 16, };
arch/arm/mach-s3c2440/mach-mini2440.c line 508
Quoted 10 lines
arch/arm/mach-s3c2440/mach-mini2440.c +2
-2-static struct i2c_board_info mini2440_i2c_devs[]__initdata = { +static struct i2c_board_info mini2440_i2c_devs[] = { {I2C_BOARD_INFO ("24c08" ,0x50 ), .platform_data = &at24c08, }, }; -static struct platform_device *mini2440_devices[]__initdata = { +static struct platform_device *mini2440_devices[] = {
You can keep this __initdata. mini2440_devices[] its used only once from a __init marked function.
jbe
Signature · 4 lines
Pengutronix e.K. | Juergen Beisert | Linux Solutions for Science and Industry | Phone: +49-8766-939 228 | Vertretung Sued/Muenchen, Germany | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de/ |
PATCH 1/1 ARM:S3C2440: MINI2440 Remove some improper __initdata qualifiers
Quoted 8 lines · Juergen Beisert
arch/arm/mach-s3c2440/mach-mini2440.c line 197
Quoted 5 lines
arch/arm/mach-s3c2440/mach-mini2440.c +1
-1-struct s3c2410fb_mach_info mini2440_fb_info__initdata = { +struct s3c2410fb_mach_info mini2440_fb_info = { .displays = &mini2440_lcd_cfg[0 ],/* not constant! see init */ .num_displays =1 , .default_display =0 ,But the other implementations in this directory are also using
__initdatafor these structures. Do they also need to remove the__initdata?
You are right. This __initdata should be kept :)
This data will be used in the function s3c24xx_fb_set_platdata which uses memcpy to make a local copy.
Quoted 7 lines
arch/arm/mach-s3c2440/mach-mini2440.c line 508
Quoted 3 lines
arch/arm/mach-s3c2440/mach-mini2440.c +1
-1-static struct platform_device *mini2440_devices[]__initdata = { +static struct platform_device *mini2440_devices[] = {You can keep this
__initdata. mini2440_devices[] its used only once from a__initmarked function.
This also should be maked as __initdata.
Thanks.
Best Regards,
Shine Liu
PATCH v2 1/1 ARM:S3C2440: MINI2440 Remove some improper __initdata qualifiers
In reply to Juergen BeisertQuoted 12 lines · Juergen Beisert
Review
Quoted 6 lines
(quoted diff) +1
-1-struct s3c2410fb_mach_info mini2440_fb_info __initdata = { +struct s3c2410fb_mach_info mini2440_fb_info = { .displays = &mini2440_lcd_cfg[0], /* not constant! see init */ .num_displays = 1, .default_display = 0,But the other implementations in this directory are also using
__initdatafor these structures. Do they also need to remove the__initdata?Quoted 1 line
Quoted 6 lines
Review
Quoted 2 lines
(quoted diff) +1
-1-static struct platform_device *mini2440_devices[] __initdata = { +static struct platform_device *mini2440_devices[] = {You can keep this
__initdata. mini2440_devices[] its used only once from a__initmarked function.
Updated the patch. Besides above two, the __initdata qualifiers for mini2440_uartcfgs, mini2440_udc_cfg and mini2440_lcd_cfg are also kept for these data are used only in the init phase or the drivers make a local copy of them.
------------------------------------------------------
arch/arm/mach-s3c2440/mach-mini2440.c +24 -24
@@ -61,7 +61,7 @@#define MACH_MINI2440_DM9K_BASE (S3C2410_CS4 + 0x300) -static struct map_desc mini2440_iodesc[]__initdata = { +static struct map_desc mini2440_iodesc[] = {/* nothing to declare, move along */ };
@@ -233,7 +233,7 @@/* MMC/SD */ -static struct s3c24xx_mci_pdata mini2440_mmc_cfg__initdata = { +static struct s3c24xx_mci_pdata mini2440_mmc_cfg = { .gpio_detect =S3C2410_GPG (8 ), .gpio_wprotect =S3C2410_GPH (8 ), .set_power =NULL ,
@@ -242,7 +242,7 @@/* NAND Flash on MINI2440 board */ -static struct mtd_partition mini2440_default_nand_part[]__initdata = { +static struct mtd_partition mini2440_default_nand_part[] = { [0 ] = { .name ="u-boot" , .size =SZ_256K ,
@@ -267,7 +267,7 @@ }, }; -static struct s3c2410_nand_set mini2440_nand_sets[]__initdata = { +static struct s3c2410_nand_set mini2440_nand_sets[] = { [0 ] = { .name ="nand" , .nr_chips =1 ,
@@ -277,7 +277,7 @@ }, }; -static struct s3c2410_platform_nand mini2440_nand_info__initdata = { +static struct s3c2410_platform_nand mini2440_nand_info = { .tacls =0 , .twrph0 =25 , .twrph1 =15 ,
@@ -288,7 +288,7 @@/* DM9000AEP 10/100 ethernet controller */ -static struct resource mini2440_dm9k_resource[]__initdata = { +static struct resource mini2440_dm9k_resource[] = { [0 ] = { .start =MACH_MINI2440_DM9K_BASE , .end =MACH_MINI2440_DM9K_BASE +3 ,
@@ -310,11 +310,11 @@* The DM9000 has no eeprom, and it's MAC address is set by * the bootloader before starting the kernel. */ -static struct dm9000_plat_data mini2440_dm9k_pdata__initdata = { +static struct dm9000_plat_data mini2440_dm9k_pdata = { .flags = (DM9000_PLATF_16BITONLY |DM9000_PLATF_NO_EEPROM ), }; -static struct platform_device mini2440_device_eth__initdata = { +static struct platform_device mini2440_device_eth = { .name ="dm9000" , .id =-1 , .num_resources =ARRAY_SIZE (mini2440_dm9k_resource),
@@ -341,7 +341,7 @@* | | +----+ +----+ * ..... */ -static struct gpio_keys_button mini2440_buttons[]__initdata = { +static struct gpio_keys_button mini2440_buttons[] = { { .gpio =S3C2410_GPG (0 ),/* K1 */ .code =KEY_F1 ,
@@ -384,12 +384,12 @@#endif }; -static struct gpio_keys_platform_data mini2440_button_data__initdata = { +static struct gpio_keys_platform_data mini2440_button_data = { .buttons = mini2440_buttons, .nbuttons =ARRAY_SIZE (mini2440_buttons), }; -static struct platform_device mini2440_button_device__initdata = { +static struct platform_device mini2440_button_device = { .name ="gpio-keys" , .id =-1 , .dev = {
@@ -399,41 +399,41 @@/* LEDS */ -static struct s3c24xx_led_platdata mini2440_led1_pdata__initdata = { +static struct s3c24xx_led_platdata mini2440_led1_pdata = { .name ="led1" , .gpio =S3C2410_GPB (5 ), .flags =S3C24XX_LEDF_ACTLOW |S3C24XX_LEDF_TRISTATE , .def_trigger ="heartbeat" , }; -static struct s3c24xx_led_platdata mini2440_led2_pdata__initdata = { +static struct s3c24xx_led_platdata mini2440_led2_pdata = { .name ="led2" , .gpio =S3C2410_GPB (6 ), .flags =S3C24XX_LEDF_ACTLOW |S3C24XX_LEDF_TRISTATE , .def_trigger ="nand-disk" , }; -static struct s3c24xx_led_platdata mini2440_led3_pdata__initdata = { +static struct s3c24xx_led_platdata mini2440_led3_pdata = { .name ="led3" , .gpio =S3C2410_GPB (7 ), .flags =S3C24XX_LEDF_ACTLOW |S3C24XX_LEDF_TRISTATE , .def_trigger ="mmc0" , }; -static struct s3c24xx_led_platdata mini2440_led4_pdata__initdata = { +static struct s3c24xx_led_platdata mini2440_led4_pdata = { .name ="led4" , .gpio =S3C2410_GPB (8 ), .flags =S3C24XX_LEDF_ACTLOW |S3C24XX_LEDF_TRISTATE , .def_trigger ="" , }; -static struct s3c24xx_led_platdata mini2440_led_backlight_pdata__initdata = { +static struct s3c24xx_led_platdata mini2440_led_backlight_pdata = { .name ="backlight" , .gpio =S3C2410_GPG (4 ), .def_trigger ="backlight" , }; -static struct platform_device mini2440_led1__initdata = { +static struct platform_device mini2440_led1 = { .name ="s3c24xx_led" , .id =1 , .dev = {
@@ -441,7 +441,7 @@ }, }; -static struct platform_device mini2440_led2__initdata = { +static struct platform_device mini2440_led2 = { .name ="s3c24xx_led" , .id =2 , .dev = {
@@ -449,7 +449,7 @@ }, }; -static struct platform_device mini2440_led3__initdata = { +static struct platform_device mini2440_led3 = { .name ="s3c24xx_led" , .id =3 , .dev = {
@@ -457,7 +457,7 @@ }, }; -static struct platform_device mini2440_led4__initdata = { +static struct platform_device mini2440_led4 = { .name ="s3c24xx_led" , .id =4 , .dev = {
@@ -465,7 +465,7 @@ }, }; -static struct platform_device mini2440_led_backlight__initdata = { +static struct platform_device mini2440_led_backlight = { .name ="s3c24xx_led" , .id =5 , .dev = {
@@ -475,14 +475,14 @@/* AUDIO */ -static struct s3c24xx_uda134x_platform_data mini2440_audio_pins__initdata = { +static struct s3c24xx_uda134x_platform_data mini2440_audio_pins = { .l3_clk =S3C2410_GPB (4 ), .l3_mode =S3C2410_GPB (2 ), .l3_data =S3C2410_GPB (3 ), .model =UDA134X_UDA1341 }; -static struct platform_device mini2440_audio__initdata = { +static struct platform_device mini2440_audio = { .name ="s3c24xx_uda134x" , .id =0 , .dev = {
@@ -498,7 +498,7 @@ .page_size = 16, }; -static struct i2c_board_info mini2440_i2c_devs[]__initdata = { +static struct i2c_board_info mini2440_i2c_devs[] = { {I2C_BOARD_INFO ("24c08" ,0x50 ), .platform_data = &at24c08,
PATCH v2 1/1 ARM:S3C2440: MINI2440 Remove some improper __initdata qualifiers
In reply to Juergen BeisertHi, Ben
I resend this patch has been posted to linux-arm-kernel last month. Orignal mail refer http://www.spinics.net/lists/arm-kernel/msg75741.html
Best Regards,
Shine
------------------------------------------------------
arch/arm/mach-s3c2440/mach-mini2440.c 2009-10-21 21:29:44.000000000 +0800 renamed from arch/arm/mach-s3c2440/mach-mini2440.c 2009-10-21 10:18:52.000000000 +0800 +24 -24
@@ -61,7 +61,7 @@ #define MACH_MINI2440_DM9K_BASE (S3C2410_CS4 + 0x300) -static struct map_desc mini2440_iodesc[] __initdata = { +static struct map_desc mini2440_iodesc[] = { /* nothing to declare, move along */ };
@@ -233,7 +233,7 @@ /* MMC/SD */ -static struct s3c24xx_mci_pdata mini2440_mmc_cfg __initdata = { +static struct s3c24xx_mci_pdata mini2440_mmc_cfg = { .gpio_detect = S3C2410_GPG(8), .gpio_wprotect = S3C2410_GPH(8), .set_power = NULL,
@@ -242,7 +242,7 @@ /* NAND Flash on MINI2440 board */ -static struct mtd_partition mini2440_default_nand_part[] __initdata = { +static struct mtd_partition mini2440_default_nand_part[] = { [0] = { .name = "u-boot", .size = SZ_256K,
@@ -267,7 +267,7 @@ }, }; -static struct s3c2410_nand_set mini2440_nand_sets[] __initdata = { +static struct s3c2410_nand_set mini2440_nand_sets[] = { [0] = { .name = "nand", .nr_chips = 1,
@@ -277,7 +277,7 @@ }, }; -static struct s3c2410_platform_nand mini2440_nand_info __initdata = { +static struct s3c2410_platform_nand mini2440_nand_info = { .tacls = 0, .twrph0 = 25, .twrph1 = 15,
@@ -288,7 +288,7 @@ /* DM9000AEP 10/100 ethernet controller */ -static struct resource mini2440_dm9k_resource[] __initdata = { +static struct resource mini2440_dm9k_resource[] = { [0] = { .start = MACH_MINI2440_DM9K_BASE, .end = MACH_MINI2440_DM9K_BASE + 3,
@@ -310,11 +310,11 @@ * The DM9000 has no eeprom, and it's MAC address is set by * the bootloader before starting the kernel. */ -static struct dm9000_plat_data mini2440_dm9k_pdata __initdata = { +static struct dm9000_plat_data mini2440_dm9k_pdata = { .flags = (DM9000_PLATF_16BITONLY | DM9000_PLATF_NO_EEPROM), }; -static struct platform_device mini2440_device_eth __initdata = { +static struct platform_device mini2440_device_eth = { .name = "dm9000", .id = -1, .num_resources = ARRAY_SIZE(mini2440_dm9k_resource),
@@ -341,7 +341,7 @@ * | | +----+ +----+ * ..... */ -static struct gpio_keys_button mini2440_buttons[] __initdata = { +static struct gpio_keys_button mini2440_buttons[] = { { .gpio = S3C2410_GPG(0), /* K1 */ .code = KEY_F1,
@@ -384,12 +384,12 @@ #endif }; -static struct gpio_keys_platform_data mini2440_button_data __initdata = { +static struct gpio_keys_platform_data mini2440_button_data = { .buttons = mini2440_buttons, .nbuttons = ARRAY_SIZE(mini2440_buttons), }; -static struct platform_device mini2440_button_device __initdata = { +static struct platform_device mini2440_button_device = { .name = "gpio-keys", .id = -1, .dev = {
@@ -399,41 +399,41 @@ /* LEDS */ -static struct s3c24xx_led_platdata mini2440_led1_pdata __initdata = { +static struct s3c24xx_led_platdata mini2440_led1_pdata = { .name = "led1", .gpio = S3C2410_GPB(5), .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE, .def_trigger = "heartbeat", }; -static struct s3c24xx_led_platdata mini2440_led2_pdata __initdata = { +static struct s3c24xx_led_platdata mini2440_led2_pdata = { .name = "led2", .gpio = S3C2410_GPB(6), .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE, .def_trigger = "nand-disk", }; -static struct s3c24xx_led_platdata mini2440_led3_pdata __initdata = { +static struct s3c24xx_led_platdata mini2440_led3_pdata = { .name = "led3", .gpio = S3C2410_GPB(7), .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE, .def_trigger = "mmc0", }; -static struct s3c24xx_led_platdata mini2440_led4_pdata __initdata = { +static struct s3c24xx_led_platdata mini2440_led4_pdata = { .name = "led4", .gpio = S3C2410_GPB(8), .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE, .def_trigger = "", }; -static struct s3c24xx_led_platdata mini2440_led_backlight_pdata __initdata = { +static struct s3c24xx_led_platdata mini2440_led_backlight_pdata = { .name = "backlight", .gpio = S3C2410_GPG(4), .def_trigger = "backlight", }; -static struct platform_device mini2440_led1 __initdata = { +static struct platform_device mini2440_led1 = { .name = "s3c24xx_led", .id = 1, .dev = {
@@ -441,7 +441,7 @@ }, }; -static struct platform_device mini2440_led2 __initdata = { +static struct platform_device mini2440_led2 = { .name = "s3c24xx_led", .id = 2, .dev = {
@@ -449,7 +449,7 @@ }, }; -static struct platform_device mini2440_led3 __initdata = { +static struct platform_device mini2440_led3 = { .name = "s3c24xx_led", .id = 3, .dev = {
@@ -457,7 +457,7 @@ }, }; -static struct platform_device mini2440_led4 __initdata = { +static struct platform_device mini2440_led4 = { .name = "s3c24xx_led", .id = 4, .dev = {
@@ -465,7 +465,7 @@ }, }; -static struct platform_device mini2440_led_backlight __initdata = { +static struct platform_device mini2440_led_backlight = { .name = "s3c24xx_led", .id = 5, .dev = {
@@ -475,14 +475,14 @@ /* AUDIO */ -static struct s3c24xx_uda134x_platform_data mini2440_audio_pins __initdata = { +static struct s3c24xx_uda134x_platform_data mini2440_audio_pins = { .l3_clk = S3C2410_GPB(4), .l3_mode = S3C2410_GPB(2), .l3_data = S3C2410_GPB(3), .model = UDA134X_UDA1341 }; -static struct platform_device mini2440_audio __initdata = { +static struct platform_device mini2440_audio = { .name = "s3c24xx_uda134x", .id = 0, .dev = {
@@ -498,7 +498,7 @@ .page_size = 16, }; -static struct i2c_board_info mini2440_i2c_devs[] __initdata = { +static struct i2c_board_info mini2440_i2c_devs[] = { { I2C_BOARD_INFO("24c08", 0x50), .platform_data = &at24c08,