Merge tag 'media/v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[firefly-linux-kernel-4.4.55.git] / arch / mips / pmcs-msp71xx / msp_setup.c

diff --git a/arch/mips/pmcs-msp71xx/msp_setup.c b/arch/mips/pmcs-msp71xx/msp_setup.c
index 7e980767679c09fc2e5c4e7c63e87b71f7906d5e..4f925e06c414663023765630cd84211d62679e16 100644 (file)
--- a/arch/mips/pmcs-msp71xx/msp_setup.c
+++ b/arch/mips/pmcs-msp71xx/msp_setup.c
@@ -27,7 +27,6 @@
 #endif
 
 extern void msp_serial_setup(void);
-extern void pmctwiled_setup(void);
 
 #if defined(CONFIG_PMC_MSP7120_EVAL) || \
     defined(CONFIG_PMC_MSP7120_GW) || \
@@ -148,8 +147,6 @@ void __init plat_mem_setup(void)
        pm_power_off = msp_power_off;
 }
 
-extern struct plat_smp_ops msp_smtc_smp_ops;
-
 void __init prom_init(void)
 {
        unsigned long family;
@@ -230,17 +227,5 @@ void __init prom_init(void)
         */
        msp_serial_setup();
 
-       if (register_vsmp_smp_ops()) {
-#ifdef CONFIG_MIPS_MT_SMTC
-               register_smp_ops(&msp_smtc_smp_ops);
-#endif
-       }
-
-#ifdef CONFIG_PMCTWILED
-       /*
-        * Setup LED states before the subsys_initcall loads other
-        * dependent drivers/modules.
-        */
-       pmctwiled_setup();
-#endif
+       register_vsmp_smp_ops();
 }