Skip to content

Commit

Permalink
[SPARC]: Kill 'prom_palette'.
Browse files Browse the repository at this point in the history
The idea of this thing is we could save/restore the firmware's
palette when breaking in and out of the firmware prompt.

Only one driver implemented this (atyfb) and it's value is
questionable.  If you're just debugging you don't really
care that the characters end up being purple or whatever.

And we can provide better debugging and firmware command
facilities with minimal in-kernel console I/O drivers.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Feb 18, 2008
1 parent 30b3cfe commit 667bc38
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 38 deletions.
6 changes: 0 additions & 6 deletions arch/sparc/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,16 +141,12 @@ void cpu_idle(void)

extern char reboot_command [];

extern void (*prom_palette)(int);

/* XXX cli/sti -> local_irq_xxx here, check this works once SMP is fixed. */
void machine_halt(void)
{
local_irq_enable();
mdelay(8);
local_irq_disable();
if (prom_palette)
prom_palette (1);
prom_halt();
panic("Halt failed!");
}
Expand All @@ -165,8 +161,6 @@ void machine_restart(char * cmd)

p = strchr (reboot_command, '\n');
if (p) *p = 0;
if (prom_palette)
prom_palette (1);
if (cmd)
prom_reboot(cmd);
if (*reboot_command)
Expand Down
3 changes: 0 additions & 3 deletions arch/sparc/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ struct screen_info screen_info = {
*/

extern unsigned long trapbase;
void (*prom_palette)(int);

/* Pretty sick eh? */
void prom_sync_me(void)
Expand All @@ -80,8 +79,6 @@ void prom_sync_me(void)
"nop\n\t"
"nop\n\t" : : "r" (&trapbase));

if (prom_palette)
prom_palette(1);
prom_printf("PROM SYNC COMMAND...\n");
show_free_areas();
if(current->pid != 0) {
Expand Down
7 changes: 0 additions & 7 deletions arch/sparc/prom/misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ prom_feval(char *fstring)
spin_unlock_irqrestore(&prom_lock, flags);
}

/* We want to do this more nicely some day. */
extern void (*prom_palette)(int);

/* Drop into the prom, with the chance to continue with the 'go'
* prom command.
*/
Expand All @@ -58,8 +55,6 @@ prom_cmdline(void)
extern void install_linux_ticker(void);
unsigned long flags;

if (prom_palette)
prom_palette (1);
spin_lock_irqsave(&prom_lock, flags);
install_obp_ticker();
(*(romvec->pv_abort))();
Expand All @@ -69,8 +64,6 @@ prom_cmdline(void)
#ifdef CONFIG_SUN_AUXIO
set_auxio(AUXIO_LED, 0);
#endif
if (prom_palette)
prom_palette (0);
}

/* Drop into the prom, but completely terminate the program.
Expand Down
8 changes: 0 additions & 8 deletions arch/sparc64/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,22 +113,16 @@ void cpu_idle(void)

extern char reboot_command [];

extern void (*prom_palette)(int);

void machine_halt(void)
{
sstate_halt();
if (prom_palette)
prom_palette (1);
prom_halt();
panic("Halt failed!");
}

void machine_alt_power_off(void)
{
sstate_poweroff();
if (prom_palette)
prom_palette(1);
prom_halt_power_off();
panic("Power-off failed!");
}
Expand All @@ -140,8 +134,6 @@ void machine_restart(char * cmd)
sstate_reboot();
p = strchr (reboot_command, '\n');
if (p) *p = 0;
if (prom_palette)
prom_palette (1);
if (cmd)
prom_reboot(cmd);
if (*reboot_command)
Expand Down
2 changes: 0 additions & 2 deletions arch/sparc64/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ struct screen_info screen_info = {
16 /* orig-video-points */
};

void (*prom_palette)(int);

static void
prom_console_write(struct console *con, const char *s, unsigned n)
{
Expand Down
3 changes: 0 additions & 3 deletions arch/sparc64/kernel/sparc64_ksyms.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ extern int (*handle_mathemu)(struct pt_regs *, struct fpustate *);
extern long sparc32_open(const char __user * filename, int flags, int mode);
extern int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
unsigned long pfn, unsigned long size, pgprot_t prot);
extern void (*prom_palette)(int);

extern int __ashrdi3(int, int);

Expand Down Expand Up @@ -355,5 +354,3 @@ EXPORT_SYMBOL(xor_niagara_2);
EXPORT_SYMBOL(xor_niagara_3);
EXPORT_SYMBOL(xor_niagara_4);
EXPORT_SYMBOL(xor_niagara_5);

EXPORT_SYMBOL(prom_palette);
9 changes: 0 additions & 9 deletions arch/sparc64/prom/misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ void prom_feval(const char *fstring)
P1275_INOUT(1, 1), fstring);
}

/* We want to do this more nicely some day. */
extern void (*prom_palette)(int);

#ifdef CONFIG_SMP
extern void smp_capture(void);
extern void smp_release(void);
Expand All @@ -72,9 +69,6 @@ void prom_cmdline(void)

local_irq_save(flags);

if (prom_palette)
prom_palette(1);

#ifdef CONFIG_SMP
smp_capture();
#endif
Expand All @@ -85,9 +79,6 @@ void prom_cmdline(void)
smp_release();
#endif

if (prom_palette)
prom_palette(0);

local_irq_restore(flags);
}

Expand Down

0 comments on commit 667bc38

Please sign in to comment.