diff options
| author | Marcus Lorentzon <marcus.xm.lorentzon@stericsson.com> | 2011-10-12 13:53:41 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-27 16:09:02 +0200 |
| commit | c46fbdcc19f267053e7613a424f8b939abc3f238 (patch) | |
| tree | 47ced63b7890d6d3f8a68638fb59982dd00ec8e9 | |
| parent | 72fb22d2887b042e9419fc2df8d64e3e8ca12674 (diff) | |
ux500: mcde: Remove unused code
mcde_get_main_display is not used in the kernel.
ST-Ericsson ID: 365249
ST-Ericsson FOSS-OUT ID: Trivial
ST-Ericsson Linux next: NA
Change-Id: I86b947e1273ba0a7340cee06cfa1d7d732d064b8
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33784
Reviewed-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com>
Tested-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-mcde.c | 24 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500-mcde.c | 17 |
2 files changed, 1 insertions, 40 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-mcde.c b/arch/arm/mach-ux500/board-mop500-mcde.c index ae043b1d21b..a179c157ff5 100644 --- a/arch/arm/mach-ux500/board-mop500-mcde.c +++ b/arch/arm/mach-ux500/board-mop500-mcde.c @@ -754,30 +754,6 @@ int __init init_display_devices(void) return ret; } -struct mcde_display_device *mcde_get_main_display(void) -{ -#if defined(CONFIG_DISPLAY_GENERIC_PRIMARY) && \ - defined(CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY) - if (!uib_is_u8500uibr3()) - return &samsung_s6d16d0_display0; - else - return &sony_acx424akp_display0; -#elif defined(CONFIG_DISPLAY_GENERIC_PRIMARY) - return &samsung_s6d16d0_display0; -#elif defined(CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY) - return &sony_acx424akp_display0; -#elif defined(CONFIG_DISPLAY_GENERIC_DSI_SECONDARY) - return &samsung_s6d16d0_display1; -#elif defined(CONFIG_DISPLAY_AV8100_TERTIARY) - return &av8100_hdmi; -#elif defined(CONFIG_DISPLAY_AB8500_TERTIARY) - return &tvout_ab8500_display; -#else - return NULL; -#endif -} -EXPORT_SYMBOL(mcde_get_main_display); - module_init(init_display_devices); #endif diff --git a/arch/arm/mach-ux500/board-u5500-mcde.c b/arch/arm/mach-ux500/board-u5500-mcde.c index 6dc8ef73f3c..9fe561033ba 100644 --- a/arch/arm/mach-ux500/board-u5500-mcde.c +++ b/arch/arm/mach-ux500/board-u5500-mcde.c @@ -496,20 +496,5 @@ int __init init_u5500_display_devices(void) return ret; } -struct mcde_display_device *mcde_u5500_get_main_display(void) -{ -#if defined(CONFIG_DISPLAY_GENERIC_DSI_PRIMARY) || \ - defined(CONFIG_DISPLAY_SONY_ACX424AKP_DSI_PRIMARY) - if (cpu_is_u5500v1()) - return &generic_display0; - if (cpu_is_u5500v2()) - return &sony_acx424akp_display0; -#elif defined(CONFIG_DISPLAY_AV8100_TERTIARY) - return &av8100_hdmi; -#endif - return NULL; -} -EXPORT_SYMBOL(mcde_u5500_get_main_display); - -module_init(init_u5500_display_devices); +module_init(init_display_devices); #endif |