Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit c60ffcbb625cf7c570bfce904f0bb525ddeaba65

Authored by Linus Torvalds
2 parents 3546eea837 07ad6ab3d7
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel… 

…/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  omap: drop __initdata tags from static struct platform_device declarations

Showing 5 changed files Side-by-side Diff

arch/arm/mach-omap1/board-ams-delta.c
Diff comments   View file @ c60ffcb
... ... @@ -215,7 +215,7 @@
215 215 .delay = 9,
216 216 };
217 217  
218   -static struct platform_device ams_delta_kp_device __initdata = {
  218 +static struct platform_device ams_delta_kp_device = {
219 219 .name = "omap-keypad",
220 220 .id = -1,
221 221 .dev = {
222 222  
... ... @@ -225,12 +225,12 @@
225 225 .resource = ams_delta_kp_resources,
226 226 };
227 227  
228   -static struct platform_device ams_delta_lcd_device __initdata = {
  228 +static struct platform_device ams_delta_lcd_device = {
229 229 .name = "lcd_ams_delta",
230 230 .id = -1,
231 231 };
232 232  
233   -static struct platform_device ams_delta_led_device __initdata = {
  233 +static struct platform_device ams_delta_led_device = {
234 234 .name = "ams-delta-led",
235 235 .id = -1
236 236 };
... ... @@ -267,7 +267,7 @@
267 267 .power = ams_delta_camera_power,
268 268 };
269 269  
270   -static struct platform_device ams_delta_camera_device __initdata = {
  270 +static struct platform_device ams_delta_camera_device = {
271 271 .name = "soc-camera-pdrv",
272 272 .id = 0,
273 273 .dev = {
arch/arm/mach-omap1/gpio15xx.c
Diff comments   View file @ c60ffcb
... ... @@ -41,7 +41,7 @@
41 41 .bank_stride = 1,
42 42 };
43 43  
44   -static struct __initdata platform_device omap15xx_mpu_gpio = {
  44 +static struct platform_device omap15xx_mpu_gpio = {
45 45 .name = "omap_gpio",
46 46 .id = 0,
47 47 .dev = {
... ... @@ -70,7 +70,7 @@
70 70 .bank_width = 16,
71 71 };
72 72  
73   -static struct __initdata platform_device omap15xx_gpio = {
  73 +static struct platform_device omap15xx_gpio = {
74 74 .name = "omap_gpio",
75 75 .id = 1,
76 76 .dev = {
arch/arm/mach-omap1/gpio16xx.c
Diff comments   View file @ c60ffcb
... ... @@ -44,7 +44,7 @@
44 44 .bank_stride = 1,
45 45 };
46 46  
47   -static struct __initdata platform_device omap16xx_mpu_gpio = {
  47 +static struct platform_device omap16xx_mpu_gpio = {
48 48 .name = "omap_gpio",
49 49 .id = 0,
50 50 .dev = {
... ... @@ -73,7 +73,7 @@
73 73 .bank_width = 16,
74 74 };
75 75  
76   -static struct __initdata platform_device omap16xx_gpio1 = {
  76 +static struct platform_device omap16xx_gpio1 = {
77 77 .name = "omap_gpio",
78 78 .id = 1,
79 79 .dev = {
... ... @@ -102,7 +102,7 @@
102 102 .bank_width = 16,
103 103 };
104 104  
105   -static struct __initdata platform_device omap16xx_gpio2 = {
  105 +static struct platform_device omap16xx_gpio2 = {
106 106 .name = "omap_gpio",
107 107 .id = 2,
108 108 .dev = {
... ... @@ -131,7 +131,7 @@
131 131 .bank_width = 16,
132 132 };
133 133  
134   -static struct __initdata platform_device omap16xx_gpio3 = {
  134 +static struct platform_device omap16xx_gpio3 = {
135 135 .name = "omap_gpio",
136 136 .id = 3,
137 137 .dev = {
... ... @@ -160,7 +160,7 @@
160 160 .bank_width = 16,
161 161 };
162 162  
163   -static struct __initdata platform_device omap16xx_gpio4 = {
  163 +static struct platform_device omap16xx_gpio4 = {
164 164 .name = "omap_gpio",
165 165 .id = 4,
166 166 .dev = {
arch/arm/mach-omap1/gpio7xx.c
Diff comments   View file @ c60ffcb
... ... @@ -46,7 +46,7 @@
46 46 .bank_stride = 2,
47 47 };
48 48  
49   -static struct __initdata platform_device omap7xx_mpu_gpio = {
  49 +static struct platform_device omap7xx_mpu_gpio = {
50 50 .name = "omap_gpio",
51 51 .id = 0,
52 52 .dev = {
... ... @@ -75,7 +75,7 @@
75 75 .bank_width = 32,
76 76 };
77 77  
78   -static struct __initdata platform_device omap7xx_gpio1 = {
  78 +static struct platform_device omap7xx_gpio1 = {
79 79 .name = "omap_gpio",
80 80 .id = 1,
81 81 .dev = {
... ... @@ -104,7 +104,7 @@
104 104 .bank_width = 32,
105 105 };
106 106  
107   -static struct __initdata platform_device omap7xx_gpio2 = {
  107 +static struct platform_device omap7xx_gpio2 = {
108 108 .name = "omap_gpio",
109 109 .id = 2,
110 110 .dev = {
... ... @@ -133,7 +133,7 @@
133 133 .bank_width = 32,
134 134 };
135 135  
136   -static struct __initdata platform_device omap7xx_gpio3 = {
  136 +static struct platform_device omap7xx_gpio3 = {
137 137 .name = "omap_gpio",
138 138 .id = 3,
139 139 .dev = {
... ... @@ -162,7 +162,7 @@
162 162 .bank_width = 32,
163 163 };
164 164  
165   -static struct __initdata platform_device omap7xx_gpio4 = {
  165 +static struct platform_device omap7xx_gpio4 = {
166 166 .name = "omap_gpio",
167 167 .id = 4,
168 168 .dev = {
... ... @@ -191,7 +191,7 @@
191 191 .bank_width = 32,
192 192 };
193 193  
194   -static struct __initdata platform_device omap7xx_gpio5 = {
  194 +static struct platform_device omap7xx_gpio5 = {
195 195 .name = "omap_gpio",
196 196 .id = 5,
197 197 .dev = {
... ... @@ -220,7 +220,7 @@
220 220 .bank_width = 32,
221 221 };
222 222  
223   -static struct __initdata platform_device omap7xx_gpio6 = {
  223 +static struct platform_device omap7xx_gpio6 = {
224 224 .name = "omap_gpio",
225 225 .id = 6,
226 226 .dev = {
arch/arm/mach-omap2/board-rx51-peripherals.c
Diff comments   View file @ c60ffcb
... ... @@ -558,7 +558,7 @@
558 558 .subdev_board_info = &rx51_si4713_board_info,
559 559 };
560 560  
561   -static struct platform_device rx51_si4713_dev __initdata_or_module = {
  561 +static struct platform_device rx51_si4713_dev = {
562 562 .name = "radio-si4713",
563 563 .id = -1,
564 564 .dev = {