Skip to contentSkip to conversation

sparc: drop CONFIG_SUN_AUXIO

PATCH Applied Sam Ravnborg 2 participants 3 messages Dec 4, 2008 SPARC + UltraSPARC (sparc/sparc64)

lore
Share & tools
lore

Sam Ravnborg

author
#0 lore raw

PATCH 1/1 sparc: drop CONFIG_SUN_AUXIO

It is always equals y so no need to test for it

Signed-off-by Sam Ravnborg <[email protected]>
---
 arch/sparc/Kconfig                 |    4 ----
 arch/sparc/kernel/devices.c        |    2 --
 arch/sparc/kernel/process_32.c     |    2 --
 arch/sparc/kernel/sparc_ksyms_32.c |    2 --
 arch/sparc/kernel/sparc_ksyms_64.c |    2 --
 arch/sparc/mm/sun4c.c              |    2 --
 arch/sparc/prom/misc_32.c          |    2 --
 7 files changed, 0 insertions(+), 16 deletions(-)
arch/sparc/Kconfig +0 -4
index 7cfe557..ecb5ff9 100644
@@ -465,10 +465,6 @@ config SBUSCHAR
 	bool
 	default y
 
-config SUN_AUXIO
-	bool
-	default y
-
 config SUN_IO
 	bool
 	default y
arch/sparc/kernel/devices.c +0 -2
index ad656b0..b171ae8 100644
@@ -133,14 +133,12 @@ void __init device_scan(void)
 #endif /* !CONFIG_SMP */
 
 	cpu_probe();
-#ifdef CONFIG_SUN_AUXIO
 	{
 		extern void auxio_probe(void);
 		extern void auxio_power_probe(void);
 		auxio_probe();
 		auxio_power_probe();
 	}
-#endif
 	clock_stop_probe();
 
 	if (ARCH_SUN4C)
arch/sparc/kernel/process_32.c +0 -2
index e8c43ff..69d9315 100644
@@ -168,11 +168,9 @@ void machine_restart(char * cmd)
 
 void machine_power_off(void)
 {
-#ifdef CONFIG_SUN_AUXIO
 	if (auxio_power_register &&
 	    (strcmp(of_console_device->type, "serial") || scons_pwroff))
 		*auxio_power_register |= AUXIO_POWER_OFF;
-#endif
 	machine_halt();
 }
arch/sparc/kernel/sparc_ksyms_32.c +0 -2
index b0dfff8..3c80562 100644
@@ -122,10 +122,8 @@ EXPORT_SYMBOL(phys_cpu_present_map);
 EXPORT_SYMBOL(__udelay);
 EXPORT_SYMBOL(__ndelay);
 EXPORT_SYMBOL(rtc_lock);
-#ifdef CONFIG_SUN_AUXIO
 EXPORT_SYMBOL(set_auxio);
 EXPORT_SYMBOL(get_auxio);
-#endif
 EXPORT_SYMBOL(io_remap_pfn_range);
 
 #ifndef CONFIG_SMP
arch/sparc/kernel/sparc_ksyms_64.c +0 -2
index c450825..e6d2bb8 100644
@@ -154,10 +154,8 @@ EXPORT_SYMBOL(sun4v_niagara_setperf);
 EXPORT_SYMBOL(sun4v_niagara2_getperf);
 EXPORT_SYMBOL(sun4v_niagara2_setperf);
 
-#ifdef CONFIG_SUN_AUXIO
 EXPORT_SYMBOL(auxio_set_led);
 EXPORT_SYMBOL(auxio_set_lte);
-#endif
 #ifdef CONFIG_SBUS
 EXPORT_SYMBOL(sbus_set_sbus64);
 #endif
arch/sparc/mm/sun4c.c +0 -2
index fe65aee..6b0c490 100644
@@ -240,9 +240,7 @@ void sun4c_complete_all_stores(void)
 
 	_unused = sun4c_get_context();
 	sun4c_set_context(_unused);
-#ifdef CONFIG_SUN_AUXIO
 	_unused = get_auxio();
-#endif
 }
 
 /* Bootup utility functions. */
arch/sparc/prom/misc_32.c +0 -2
index 49b5057..cf6c3f6 100644
@@ -61,9 +61,7 @@ prom_cmdline(void)
 	restore_current();
 	install_linux_ticker();
 	spin_unlock_irqrestore(&prom_lock, flags);
-#ifdef CONFIG_SUN_AUXIO
 	set_auxio(AUXIO_LED, 0);
-#endif
 }
 
 /* Drop into the prom, but completely terminate the program.
Signature · 1 line
1.5.6.GIT
maintainer Applied
#1 lore raw

From: Sam Ravnborg <[email protected]>
Date: Thu, 4 Dec 2008 22:23:06 +0100

Quoted 3 lines

It is always equals y so no need to test for it

Signed-off-by Sam Ravnborg <[email protected]>

Applied, thanks Sam.

I seem to have dropped your previous submission of this patch for some reason, sorry about that. :)

author
#2 lore raw
In reply to Sam Ravnborg
Quoted 11 lines · David Miller

From: Sam Ravnborg <[email protected]>
Date: Thu, 4 Dec 2008 22:23:06 +0100

Quoted 3 lines

It is always equals y so no need to test for it

Signed-off-by Sam Ravnborg <[email protected]>

Applied, thanks Sam.

I seem to have dropped your previous submission of this patch for some reason, sorry about that. :)

The previous one was an RFC only and I promised to send a new one after the unification.

Sam