diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:24:21 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 15:21:11 -0500 |
commit | a9e9ce4c41672cf3f6fcb1288bfd6b26c1f2a917 (patch) | |
tree | fcc837543951ad2a54a26ae04bb436b377ef99eb /drivers/mfd/88pm860x-core.c | |
parent | f791be492f76dea7b0641ed227a60eeb2fa7e255 (diff) |
mfd: remove use of __devinitdata
CONFIG_HOTPLUG is going away as an option so __devinitdata is no
longer needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mfd/88pm860x-core.c')
-rw-r--r-- | drivers/mfd/88pm860x-core.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c index ad36ad70a0c2..20dd0d41aee4 100644 --- a/drivers/mfd/88pm860x-core.c +++ b/drivers/mfd/88pm860x-core.c | |||
@@ -28,111 +28,111 @@ | |||
28 | 28 | ||
29 | #define INT_STATUS_NUM 3 | 29 | #define INT_STATUS_NUM 3 |
30 | 30 | ||
31 | static struct resource bk0_resources[] __devinitdata = { | 31 | static struct resource bk0_resources[] = { |
32 | {2, 2, "duty cycle", IORESOURCE_REG, }, | 32 | {2, 2, "duty cycle", IORESOURCE_REG, }, |
33 | {3, 3, "always on", IORESOURCE_REG, }, | 33 | {3, 3, "always on", IORESOURCE_REG, }, |
34 | {3, 3, "current", IORESOURCE_REG, }, | 34 | {3, 3, "current", IORESOURCE_REG, }, |
35 | }; | 35 | }; |
36 | static struct resource bk1_resources[] __devinitdata = { | 36 | static struct resource bk1_resources[] = { |
37 | {4, 4, "duty cycle", IORESOURCE_REG, }, | 37 | {4, 4, "duty cycle", IORESOURCE_REG, }, |
38 | {5, 5, "always on", IORESOURCE_REG, }, | 38 | {5, 5, "always on", IORESOURCE_REG, }, |
39 | {5, 5, "current", IORESOURCE_REG, }, | 39 | {5, 5, "current", IORESOURCE_REG, }, |
40 | }; | 40 | }; |
41 | static struct resource bk2_resources[] __devinitdata = { | 41 | static struct resource bk2_resources[] = { |
42 | {6, 6, "duty cycle", IORESOURCE_REG, }, | 42 | {6, 6, "duty cycle", IORESOURCE_REG, }, |
43 | {7, 7, "always on", IORESOURCE_REG, }, | 43 | {7, 7, "always on", IORESOURCE_REG, }, |
44 | {5, 5, "current", IORESOURCE_REG, }, | 44 | {5, 5, "current", IORESOURCE_REG, }, |
45 | }; | 45 | }; |
46 | 46 | ||
47 | static struct resource led0_resources[] __devinitdata = { | 47 | static struct resource led0_resources[] = { |
48 | /* RGB1 Red LED */ | 48 | /* RGB1 Red LED */ |
49 | {0xd, 0xd, "control", IORESOURCE_REG, }, | 49 | {0xd, 0xd, "control", IORESOURCE_REG, }, |
50 | {0xc, 0xc, "blink", IORESOURCE_REG, }, | 50 | {0xc, 0xc, "blink", IORESOURCE_REG, }, |
51 | }; | 51 | }; |
52 | static struct resource led1_resources[] __devinitdata = { | 52 | static struct resource led1_resources[] = { |
53 | /* RGB1 Green LED */ | 53 | /* RGB1 Green LED */ |
54 | {0xe, 0xe, "control", IORESOURCE_REG, }, | 54 | {0xe, 0xe, "control", IORESOURCE_REG, }, |
55 | {0xc, 0xc, "blink", IORESOURCE_REG, }, | 55 | {0xc, 0xc, "blink", IORESOURCE_REG, }, |
56 | }; | 56 | }; |
57 | static struct resource led2_resources[] __devinitdata = { | 57 | static struct resource led2_resources[] = { |
58 | /* RGB1 Blue LED */ | 58 | /* RGB1 Blue LED */ |
59 | {0xf, 0xf, "control", IORESOURCE_REG, }, | 59 | {0xf, 0xf, "control", IORESOURCE_REG, }, |
60 | {0xc, 0xc, "blink", IORESOURCE_REG, }, | 60 | {0xc, 0xc, "blink", IORESOURCE_REG, }, |
61 | }; | 61 | }; |
62 | static struct resource led3_resources[] __devinitdata = { | 62 | static struct resource led3_resources[] = { |
63 | /* RGB2 Red LED */ | 63 | /* RGB2 Red LED */ |
64 | {0x9, 0x9, "control", IORESOURCE_REG, }, | 64 | {0x9, 0x9, "control", IORESOURCE_REG, }, |
65 | {0x8, 0x8, "blink", IORESOURCE_REG, }, | 65 | {0x8, 0x8, "blink", IORESOURCE_REG, }, |
66 | }; | 66 | }; |
67 | static struct resource led4_resources[] __devinitdata = { | 67 | static struct resource led4_resources[] = { |
68 | /* RGB2 Green LED */ | 68 | /* RGB2 Green LED */ |
69 | {0xa, 0xa, "control", IORESOURCE_REG, }, | 69 | {0xa, 0xa, "control", IORESOURCE_REG, }, |
70 | {0x8, 0x8, "blink", IORESOURCE_REG, }, | 70 | {0x8, 0x8, "blink", IORESOURCE_REG, }, |
71 | }; | 71 | }; |
72 | static struct resource led5_resources[] __devinitdata = { | 72 | static struct resource led5_resources[] = { |
73 | /* RGB2 Blue LED */ | 73 | /* RGB2 Blue LED */ |
74 | {0xb, 0xb, "control", IORESOURCE_REG, }, | 74 | {0xb, 0xb, "control", IORESOURCE_REG, }, |
75 | {0x8, 0x8, "blink", IORESOURCE_REG, }, | 75 | {0x8, 0x8, "blink", IORESOURCE_REG, }, |
76 | }; | 76 | }; |
77 | 77 | ||
78 | static struct resource buck1_resources[] __devinitdata = { | 78 | static struct resource buck1_resources[] = { |
79 | {0x24, 0x24, "buck set", IORESOURCE_REG, }, | 79 | {0x24, 0x24, "buck set", IORESOURCE_REG, }, |
80 | }; | 80 | }; |
81 | static struct resource buck2_resources[] __devinitdata = { | 81 | static struct resource buck2_resources[] = { |
82 | {0x25, 0x25, "buck set", IORESOURCE_REG, }, | 82 | {0x25, 0x25, "buck set", IORESOURCE_REG, }, |
83 | }; | 83 | }; |
84 | static struct resource buck3_resources[] __devinitdata = { | 84 | static struct resource buck3_resources[] = { |
85 | {0x26, 0x26, "buck set", IORESOURCE_REG, }, | 85 | {0x26, 0x26, "buck set", IORESOURCE_REG, }, |
86 | }; | 86 | }; |
87 | static struct resource ldo1_resources[] __devinitdata = { | 87 | static struct resource ldo1_resources[] = { |
88 | {0x10, 0x10, "ldo set", IORESOURCE_REG, }, | 88 | {0x10, 0x10, "ldo set", IORESOURCE_REG, }, |
89 | }; | 89 | }; |
90 | static struct resource ldo2_resources[] __devinitdata = { | 90 | static struct resource ldo2_resources[] = { |
91 | {0x11, 0x11, "ldo set", IORESOURCE_REG, }, | 91 | {0x11, 0x11, "ldo set", IORESOURCE_REG, }, |
92 | }; | 92 | }; |
93 | static struct resource ldo3_resources[] __devinitdata = { | 93 | static struct resource ldo3_resources[] = { |
94 | {0x12, 0x12, "ldo set", IORESOURCE_REG, }, | 94 | {0x12, 0x12, "ldo set", IORESOURCE_REG, }, |
95 | }; | 95 | }; |
96 | static struct resource ldo4_resources[] __devinitdata = { | 96 | static struct resource ldo4_resources[] = { |
97 | {0x13, 0x13, "ldo set", IORESOURCE_REG, }, | 97 | {0x13, 0x13, "ldo set", IORESOURCE_REG, }, |
98 | }; | 98 | }; |
99 | static struct resource ldo5_resources[] __devinitdata = { | 99 | static struct resource ldo5_resources[] = { |
100 | {0x14, 0x14, "ldo set", IORESOURCE_REG, }, | 100 | {0x14, 0x14, "ldo set", IORESOURCE_REG, }, |
101 | }; | 101 | }; |
102 | static struct resource ldo6_resources[] __devinitdata = { | 102 | static struct resource ldo6_resources[] = { |
103 | {0x15, 0x15, "ldo set", IORESOURCE_REG, }, | 103 | {0x15, 0x15, "ldo set", IORESOURCE_REG, }, |
104 | }; | 104 | }; |
105 | static struct resource ldo7_resources[] __devinitdata = { | 105 | static struct resource ldo7_resources[] = { |
106 | {0x16, 0x16, "ldo set", IORESOURCE_REG, }, | 106 | {0x16, 0x16, "ldo set", IORESOURCE_REG, }, |
107 | }; | 107 | }; |
108 | static struct resource ldo8_resources[] __devinitdata = { | 108 | static struct resource ldo8_resources[] = { |
109 | {0x17, 0x17, "ldo set", IORESOURCE_REG, }, | 109 | {0x17, 0x17, "ldo set", IORESOURCE_REG, }, |
110 | }; | 110 | }; |
111 | static struct resource ldo9_resources[] __devinitdata = { | 111 | static struct resource ldo9_resources[] = { |
112 | {0x18, 0x18, "ldo set", IORESOURCE_REG, }, | 112 | {0x18, 0x18, "ldo set", IORESOURCE_REG, }, |
113 | }; | 113 | }; |
114 | static struct resource ldo10_resources[] __devinitdata = { | 114 | static struct resource ldo10_resources[] = { |
115 | {0x19, 0x19, "ldo set", IORESOURCE_REG, }, | 115 | {0x19, 0x19, "ldo set", IORESOURCE_REG, }, |
116 | }; | 116 | }; |
117 | static struct resource ldo12_resources[] __devinitdata = { | 117 | static struct resource ldo12_resources[] = { |
118 | {0x1a, 0x1a, "ldo set", IORESOURCE_REG, }, | 118 | {0x1a, 0x1a, "ldo set", IORESOURCE_REG, }, |
119 | }; | 119 | }; |
120 | static struct resource ldo_vibrator_resources[] __devinitdata = { | 120 | static struct resource ldo_vibrator_resources[] = { |
121 | {0x28, 0x28, "ldo set", IORESOURCE_REG, }, | 121 | {0x28, 0x28, "ldo set", IORESOURCE_REG, }, |
122 | }; | 122 | }; |
123 | static struct resource ldo14_resources[] __devinitdata = { | 123 | static struct resource ldo14_resources[] = { |
124 | {0x1b, 0x1b, "ldo set", IORESOURCE_REG, }, | 124 | {0x1b, 0x1b, "ldo set", IORESOURCE_REG, }, |
125 | }; | 125 | }; |
126 | 126 | ||
127 | static struct resource touch_resources[] __devinitdata = { | 127 | static struct resource touch_resources[] = { |
128 | {PM8607_IRQ_PEN, PM8607_IRQ_PEN, "touch", IORESOURCE_IRQ,}, | 128 | {PM8607_IRQ_PEN, PM8607_IRQ_PEN, "touch", IORESOURCE_IRQ,}, |
129 | }; | 129 | }; |
130 | 130 | ||
131 | static struct resource onkey_resources[] __devinitdata = { | 131 | static struct resource onkey_resources[] = { |
132 | {PM8607_IRQ_ONKEY, PM8607_IRQ_ONKEY, "onkey", IORESOURCE_IRQ,}, | 132 | {PM8607_IRQ_ONKEY, PM8607_IRQ_ONKEY, "onkey", IORESOURCE_IRQ,}, |
133 | }; | 133 | }; |
134 | 134 | ||
135 | static struct resource codec_resources[] __devinitdata = { | 135 | static struct resource codec_resources[] = { |
136 | /* Headset microphone insertion or removal */ | 136 | /* Headset microphone insertion or removal */ |
137 | {PM8607_IRQ_MICIN, PM8607_IRQ_MICIN, "micin", IORESOURCE_IRQ,}, | 137 | {PM8607_IRQ_MICIN, PM8607_IRQ_MICIN, "micin", IORESOURCE_IRQ,}, |
138 | /* Hook-switch press or release */ | 138 | /* Hook-switch press or release */ |
@@ -143,12 +143,12 @@ static struct resource codec_resources[] __devinitdata = { | |||
143 | {PM8607_IRQ_AUDIO_SHORT, PM8607_IRQ_AUDIO_SHORT, "audio-short", IORESOURCE_IRQ,}, | 143 | {PM8607_IRQ_AUDIO_SHORT, PM8607_IRQ_AUDIO_SHORT, "audio-short", IORESOURCE_IRQ,}, |
144 | }; | 144 | }; |
145 | 145 | ||
146 | static struct resource battery_resources[] __devinitdata = { | 146 | static struct resource battery_resources[] = { |
147 | {PM8607_IRQ_CC, PM8607_IRQ_CC, "columb counter", IORESOURCE_IRQ,}, | 147 | {PM8607_IRQ_CC, PM8607_IRQ_CC, "columb counter", IORESOURCE_IRQ,}, |
148 | {PM8607_IRQ_BAT, PM8607_IRQ_BAT, "battery", IORESOURCE_IRQ,}, | 148 | {PM8607_IRQ_BAT, PM8607_IRQ_BAT, "battery", IORESOURCE_IRQ,}, |
149 | }; | 149 | }; |
150 | 150 | ||
151 | static struct resource charger_resources[] __devinitdata = { | 151 | static struct resource charger_resources[] = { |
152 | {PM8607_IRQ_CHG, PM8607_IRQ_CHG, "charger detect", IORESOURCE_IRQ,}, | 152 | {PM8607_IRQ_CHG, PM8607_IRQ_CHG, "charger detect", IORESOURCE_IRQ,}, |
153 | {PM8607_IRQ_CHG_DONE, PM8607_IRQ_CHG_DONE, "charging done", IORESOURCE_IRQ,}, | 153 | {PM8607_IRQ_CHG_DONE, PM8607_IRQ_CHG_DONE, "charging done", IORESOURCE_IRQ,}, |
154 | {PM8607_IRQ_CHG_FAIL, PM8607_IRQ_CHG_FAIL, "charging timeout", IORESOURCE_IRQ,}, | 154 | {PM8607_IRQ_CHG_FAIL, PM8607_IRQ_CHG_FAIL, "charging timeout", IORESOURCE_IRQ,}, |
@@ -158,11 +158,11 @@ static struct resource charger_resources[] __devinitdata = { | |||
158 | {PM8607_IRQ_VCHG, PM8607_IRQ_VCHG, "vchg voltage", IORESOURCE_IRQ,}, | 158 | {PM8607_IRQ_VCHG, PM8607_IRQ_VCHG, "vchg voltage", IORESOURCE_IRQ,}, |
159 | }; | 159 | }; |
160 | 160 | ||
161 | static struct resource rtc_resources[] __devinitdata = { | 161 | static struct resource rtc_resources[] = { |
162 | {PM8607_IRQ_RTC, PM8607_IRQ_RTC, "rtc", IORESOURCE_IRQ,}, | 162 | {PM8607_IRQ_RTC, PM8607_IRQ_RTC, "rtc", IORESOURCE_IRQ,}, |
163 | }; | 163 | }; |
164 | 164 | ||
165 | static struct mfd_cell bk_devs[] __devinitdata = { | 165 | static struct mfd_cell bk_devs[] = { |
166 | { | 166 | { |
167 | .name = "88pm860x-backlight", | 167 | .name = "88pm860x-backlight", |
168 | .id = 0, | 168 | .id = 0, |
@@ -181,7 +181,7 @@ static struct mfd_cell bk_devs[] __devinitdata = { | |||
181 | }, | 181 | }, |
182 | }; | 182 | }; |
183 | 183 | ||
184 | static struct mfd_cell led_devs[] __devinitdata = { | 184 | static struct mfd_cell led_devs[] = { |
185 | { | 185 | { |
186 | .name = "88pm860x-led", | 186 | .name = "88pm860x-led", |
187 | .id = 0, | 187 | .id = 0, |
@@ -215,7 +215,7 @@ static struct mfd_cell led_devs[] __devinitdata = { | |||
215 | }, | 215 | }, |
216 | }; | 216 | }; |
217 | 217 | ||
218 | static struct mfd_cell reg_devs[] __devinitdata = { | 218 | static struct mfd_cell reg_devs[] = { |
219 | { | 219 | { |
220 | .name = "88pm860x-regulator", | 220 | .name = "88pm860x-regulator", |
221 | .id = 0, | 221 | .id = 0, |