diff options
author | Dmitry Artamonow <mad_soft@inbox.ru> | 2009-03-15 14:11:21 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-15 16:08:17 -0400 |
commit | ddcd8c09001e66f78488bfc238ed5bd8441d4496 (patch) | |
tree | f8db9f97b3e822dc99a4748fcf4c04ee84f349b9 /arch/arm/mach-sa1100/h3600.c | |
parent | f110b3f2a61d26329290036dac3d70a6733099de (diff) |
[ARM] 5425/1: h3600: first stage of ipaq_model_ops cleanup
Remove unused fields and associated funtions-accesors.
Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/h3600.c')
-rw-r--r-- | arch/arm/mach-sa1100/h3600.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c index 4920b89d149c..9f13f5bd57a2 100644 --- a/arch/arm/mach-sa1100/h3600.c +++ b/arch/arm/mach-sa1100/h3600.c | |||
@@ -227,12 +227,6 @@ static void __init h3xxx_map_io(void) | |||
227 | sa1100fb_lcd_power = h3xxx_lcd_power; | 227 | sa1100fb_lcd_power = h3xxx_lcd_power; |
228 | } | 228 | } |
229 | 229 | ||
230 | static __inline__ void do_blank(int setp) | ||
231 | { | ||
232 | if (ipaq_model_ops.blank_callback) | ||
233 | ipaq_model_ops.blank_callback(1-setp); | ||
234 | } | ||
235 | |||
236 | /************************* H3100 *************************/ | 230 | /************************* H3100 *************************/ |
237 | 231 | ||
238 | #ifdef CONFIG_SA1100_H3100 | 232 | #ifdef CONFIG_SA1100_H3100 |
@@ -250,7 +244,6 @@ static void h3100_control_egpio(enum ipaq_egpio_type x, int setp) | |||
250 | case IPAQ_EGPIO_LCD_POWER: | 244 | case IPAQ_EGPIO_LCD_POWER: |
251 | egpio |= EGPIO_H3600_LCD_ON; | 245 | egpio |= EGPIO_H3600_LCD_ON; |
252 | gpio |= GPIO_H3100_LCD_3V_ON; | 246 | gpio |= GPIO_H3100_LCD_3V_ON; |
253 | do_blank(setp); | ||
254 | break; | 247 | break; |
255 | case IPAQ_EGPIO_LCD_ENABLE: | 248 | case IPAQ_EGPIO_LCD_ENABLE: |
256 | break; | 249 | break; |
@@ -304,23 +297,8 @@ static void h3100_control_egpio(enum ipaq_egpio_type x, int setp) | |||
304 | } | 297 | } |
305 | } | 298 | } |
306 | 299 | ||
307 | static unsigned long h3100_read_egpio(void) | ||
308 | { | ||
309 | return h3100_egpio; | ||
310 | } | ||
311 | |||
312 | static int h3100_pm_callback(int req) | ||
313 | { | ||
314 | if (ipaq_model_ops.pm_callback_aux) | ||
315 | return ipaq_model_ops.pm_callback_aux(req); | ||
316 | return 0; | ||
317 | } | ||
318 | |||
319 | static struct ipaq_model_ops h3100_model_ops __initdata = { | 300 | static struct ipaq_model_ops h3100_model_ops __initdata = { |
320 | .generic_name = "3100", | ||
321 | .control = h3100_control_egpio, | 301 | .control = h3100_control_egpio, |
322 | .read = h3100_read_egpio, | ||
323 | .pm_callback = h3100_pm_callback | ||
324 | }; | 302 | }; |
325 | 303 | ||
326 | #define H3100_DIRECT_EGPIO (GPIO_H3100_BT_ON \ | 304 | #define H3100_DIRECT_EGPIO (GPIO_H3100_BT_ON \ |
@@ -381,7 +359,6 @@ static void h3600_control_egpio(enum ipaq_egpio_type x, int setp) | |||
381 | EGPIO_H3600_LCD_PCI | | 359 | EGPIO_H3600_LCD_PCI | |
382 | EGPIO_H3600_LCD_5V_ON | | 360 | EGPIO_H3600_LCD_5V_ON | |
383 | EGPIO_H3600_LVDD_ON; | 361 | EGPIO_H3600_LVDD_ON; |
384 | do_blank(setp); | ||
385 | break; | 362 | break; |
386 | case IPAQ_EGPIO_LCD_ENABLE: | 363 | case IPAQ_EGPIO_LCD_ENABLE: |
387 | break; | 364 | break; |
@@ -432,23 +409,8 @@ static void h3600_control_egpio(enum ipaq_egpio_type x, int setp) | |||
432 | } | 409 | } |
433 | } | 410 | } |
434 | 411 | ||
435 | static unsigned long h3600_read_egpio(void) | ||
436 | { | ||
437 | return h3600_egpio; | ||
438 | } | ||
439 | |||
440 | static int h3600_pm_callback(int req) | ||
441 | { | ||
442 | if (ipaq_model_ops.pm_callback_aux) | ||
443 | return ipaq_model_ops.pm_callback_aux(req); | ||
444 | return 0; | ||
445 | } | ||
446 | |||
447 | static struct ipaq_model_ops h3600_model_ops __initdata = { | 412 | static struct ipaq_model_ops h3600_model_ops __initdata = { |
448 | .generic_name = "3600", | ||
449 | .control = h3600_control_egpio, | 413 | .control = h3600_control_egpio, |
450 | .read = h3600_read_egpio, | ||
451 | .pm_callback = h3600_pm_callback | ||
452 | }; | 414 | }; |
453 | 415 | ||
454 | static void __init h3600_map_io(void) | 416 | static void __init h3600_map_io(void) |