mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 15:47:36 +00:00
Code Issues Releases Wiki Activity

sh: Kill off more dead symbols.

Browse source 
Reported-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2008-02-13 20:28:12 +09:00
parent db02612b4e
commit f99cb7a43c
6 changed files with 17 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
arch/sh/cchips/hd6446x/hd64465/setup.c
View file

@ -17,10 +17,8 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/hd64465/hd64465.h> #include <asm/hd64465/hd64465.h>
static void disable_hd64465_irq(unsigned int irq) static void disable_hd64465_irq(unsigned int irq)
@ -28,51 +26,45 @@ static void disable_hd64465_irq(unsigned int irq)
unsigned short nimr; unsigned short nimr;
unsigned short mask = 1 << (irq - HD64465_IRQ_BASE); unsigned short mask = 1 << (irq - HD64465_IRQ_BASE);
pr_debug("disable_hd64465_irq(%d): mask=%x\n", irq, mask); pr_debug("disable_hd64465_irq(%d): mask=%x\n", irq, mask);
nimr = inw(HD64465_REG_NIMR); nimr = inw(HD64465_REG_NIMR);
nimr |= mask; nimr |= mask;
outw(nimr, HD64465_REG_NIMR); outw(nimr, HD64465_REG_NIMR);
} }
static void enable_hd64465_irq(unsigned int irq) static void enable_hd64465_irq(unsigned int irq)
{ {
unsigned short nimr; unsigned short nimr;
unsigned short mask = 1 << (irq - HD64465_IRQ_BASE); unsigned short mask = 1 << (irq - HD64465_IRQ_BASE);
pr_debug("enable_hd64465_irq(%d): mask=%x\n", irq, mask); pr_debug("enable_hd64465_irq(%d): mask=%x\n", irq, mask);
nimr = inw(HD64465_REG_NIMR); nimr = inw(HD64465_REG_NIMR);
nimr &= ~mask; nimr &= ~mask;
outw(nimr, HD64465_REG_NIMR); outw(nimr, HD64465_REG_NIMR);
} }
static void mask_and_ack_hd64465(unsigned int irq) static void mask_and_ack_hd64465(unsigned int irq)
{ {
disable_hd64465_irq(irq); disable_hd64465_irq(irq);
} }
static void end_hd64465_irq(unsigned int irq) static void end_hd64465_irq(unsigned int irq)
{ {
if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
enable_hd64465_irq(irq); enable_hd64465_irq(irq);
} }
static unsigned int startup_hd64465_irq(unsigned int irq) static unsigned int startup_hd64465_irq(unsigned int irq)
{ {
enable_hd64465_irq(irq); enable_hd64465_irq(irq);
return 0; return 0;
} }
static void shutdown_hd64465_irq(unsigned int irq) static void shutdown_hd64465_irq(unsigned int irq)
{ {
disable_hd64465_irq(irq); disable_hd64465_irq(irq);
} }
static struct hw_interrupt_type hd64465_irq_type = { static struct hw_interrupt_type hd64465_irq_type = {
.typename = "HD64465-IRQ", .typename = "HD64465-IRQ",
.startup = startup_hd64465_irq, .startup = startup_hd64465_irq,
@ -83,7 +75,6 @@ static struct hw_interrupt_type hd64465_irq_type = {
.end = end_hd64465_irq, .end = end_hd64465_irq,
}; };
static irqreturn_t hd64465_interrupt(int irq, void *dev_id) static irqreturn_t hd64465_interrupt(int irq, void *dev_id)
{ {
printk(KERN_INFO printk(KERN_INFO
@ -93,9 +84,6 @@ static irqreturn_t hd64465_interrupt(int irq, void *dev_id)
return IRQ_NONE; return IRQ_NONE;
} }
/*====================================================*/
/* /*
* Support for a secondary IRQ demux step. This is necessary * Support for a secondary IRQ demux step. This is necessary
* because the HD64465 presents a very thin interface to the * because the HD64465 presents a very thin interface to the
@ -103,8 +91,7 @@ static irqreturn_t hd64465_interrupt(int irq, void *dev_id)
* normally done in hardware by other PCMCIA host bridges is * normally done in hardware by other PCMCIA host bridges is
* instead done in software. * instead done in software.
*/ */
static struct static struct {
{
int (*func)(int, void *); int (*func)(int, void *);
void *dev; void *dev;
} hd64465_demux[HD64465_IRQ_NUM]; } hd64465_demux[HD64465_IRQ_NUM];
@ -112,19 +99,17 @@ static struct
void hd64465_register_irq_demux(int irq, void hd64465_register_irq_demux(int irq,
int (*demux)(int irq, void *dev), void *dev) int (*demux)(int irq, void *dev), void *dev)
{ {
hd64465_demux[irq - HD64465_IRQ_BASE].func = demux; hd64465_demux[irq - HD64465_IRQ_BASE].func = demux;
hd64465_demux[irq - HD64465_IRQ_BASE].dev = dev; hd64465_demux[irq - HD64465_IRQ_BASE].dev = dev;
} }
EXPORT_SYMBOL(hd64465_register_irq_demux); EXPORT_SYMBOL(hd64465_register_irq_demux);
void hd64465_unregister_irq_demux(int irq) void hd64465_unregister_irq_demux(int irq)
{ {
hd64465_demux[irq - HD64465_IRQ_BASE].func = 0; hd64465_demux[irq - HD64465_IRQ_BASE].func = 0;
} }
EXPORT_SYMBOL(hd64465_unregister_irq_demux); EXPORT_SYMBOL(hd64465_unregister_irq_demux);
int hd64465_irq_demux(int irq) int hd64465_irq_demux(int irq)
{ {
if (irq == CONFIG_HD64465_IRQ) { if (irq == CONFIG_HD64465_IRQ) {
@ -132,16 +117,16 @@ int hd64465_irq_demux(int irq)
unsigned short nirr = inw(HD64465_REG_NIRR); unsigned short nirr = inw(HD64465_REG_NIRR);
unsigned short nimr = inw(HD64465_REG_NIMR); unsigned short nimr = inw(HD64465_REG_NIMR);
pr_debug("hd64465_irq_demux, nirr=%04x, nimr=%04x\n", nirr, nimr); pr_debug("hd64465_irq_demux, nirr=%04x, nimr=%04x\n", nirr, nimr);
nirr &= ~nimr; nirr &= ~nimr;
for (bit = 1, i = 0 ; i < HD64465_IRQ_NUM ; bit <<= 1, i++) for (bit = 1, i = 0 ; i < HD64465_IRQ_NUM ; bit <<= 1, i++)
if (nirr & bit) if (nirr & bit)
break; break;
if (i < HD64465_IRQ_NUM) { if (i < HD64465_IRQ_NUM) {
irq = HD64465_IRQ_BASE + i; irq = HD64465_IRQ_BASE + i;
if (hd64465_demux[i].func != 0) if (hd64465_demux[i].func != 0)
irq = hd64465_demux[i].func(irq, hd64465_demux[i].dev); irq = hd64465_demux[i].func(irq, hd64465_demux[i].dev);
} }
} }
return irq; return irq;
@ -154,7 +139,6 @@ static struct irqaction irq0 = {
.name = "HD64465", .name = "HD64465",
}; };
static int __init setup_hd64465(void) static int __init setup_hd64465(void)
{ {
int i; int i;
@ -176,8 +160,8 @@ static int __init setup_hd64465(void)
rev = inw(HD64465_REG_SRR); rev = inw(HD64465_REG_SRR);
printk(KERN_INFO "HD64465 hardware revision %d.%d\n", (rev >> 8) & 0xff, rev & 0xff); printk(KERN_INFO "HD64465 hardware revision %d.%d\n", (rev >> 8) & 0xff, rev & 0xff);
outw(0xffff, HD64465_REG_NIMR); /* mask all interrupts */ outw(0xffff, HD64465_REG_NIMR); /* mask all interrupts */
for (i = 0; i < HD64465_IRQ_NUM ; i++) { for (i = 0; i < HD64465_IRQ_NUM ; i++) {
irq_desc[HD64465_IRQ_BASE + i].chip = &hd64465_irq_type; irq_desc[HD64465_IRQ_BASE + i].chip = &hd64465_irq_type;
@ -185,16 +169,13 @@ static int __init setup_hd64465(void)
setup_irq(CONFIG_HD64465_IRQ, &irq0); setup_irq(CONFIG_HD64465_IRQ, &irq0);
#ifdef CONFIG_SERIAL
/* wake up the UART from STANDBY at this point */ /* wake up the UART from STANDBY at this point */
smscr = inw(HD64465_REG_SMSCR); smscr = inw(HD64465_REG_SMSCR);
outw(smscr & (~HD64465_SMSCR_UARTST), HD64465_REG_SMSCR); outw(smscr & (~HD64465_SMSCR_UARTST), HD64465_REG_SMSCR);
/* remap IO ports for first ISA serial port to HD64465 UART */ /* remap IO ports for first ISA serial port to HD64465 UART */
hd64465_port_map(0x3f8, 8, CONFIG_HD64465_IOBASE + 0x8000, 1); hd64465_port_map(0x3f8, 8, CONFIG_HD64465_IOBASE + 0x8000, 1);
#endif
return 0; return 0;
} }
module_init(setup_hd64465); module_init(setup_hd64465);

1
arch/sh/configs/se7705_defconfig
View file

@ -231,7 +231,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y
# CONFIG_SH_DSP is not set # CONFIG_SH_DSP is not set
# CONFIG_SH_ADC is not set # CONFIG_SH_ADC is not set
CONFIG_CPU_HAS_INTEVT=y CONFIG_CPU_HAS_INTEVT=y
CONFIG_CPU_HAS_PINT_IRQ=y
CONFIG_CPU_HAS_IPR_IRQ=y CONFIG_CPU_HAS_IPR_IRQ=y
CONFIG_CPU_HAS_SR_RB=y CONFIG_CPU_HAS_SR_RB=y

3
arch/sh/kernel/irq.c
View file

@ -248,9 +248,6 @@ asmlinkage void do_softirq(void)
void __init init_IRQ(void) void __init init_IRQ(void)
{ {
#ifdef CONFIG_CPU_HAS_PINT_IRQ
init_IRQ_pint();
#endif
plat_irq_setup(); plat_irq_setup();
/* Perform the machine specific initialisation */ /* Perform the machine specific initialisation */

4
arch/sh/kernel/traps_64.c
View file

@ -630,7 +630,7 @@ static int misaligned_fpu_load(struct pt_regs *regs,
current->thread.fpu.hard.fp_regs[destreg] = buflo; current->thread.fpu.hard.fp_regs[destreg] = buflo;
current->thread.fpu.hard.fp_regs[destreg+1] = bufhi; current->thread.fpu.hard.fp_regs[destreg+1] = bufhi;
} else { } else {
#if defined(CONFIG_LITTLE_ENDIAN) #if defined(CONFIG_CPU_LITTLE_ENDIAN)
current->thread.fpu.hard.fp_regs[destreg] = bufhi; current->thread.fpu.hard.fp_regs[destreg] = bufhi;
current->thread.fpu.hard.fp_regs[destreg+1] = buflo; current->thread.fpu.hard.fp_regs[destreg+1] = buflo;
#else #else
@ -700,7 +700,7 @@ static int misaligned_fpu_store(struct pt_regs *regs,
buflo = current->thread.fpu.hard.fp_regs[srcreg]; buflo = current->thread.fpu.hard.fp_regs[srcreg];
bufhi = current->thread.fpu.hard.fp_regs[srcreg+1]; bufhi = current->thread.fpu.hard.fp_regs[srcreg+1];
} else { } else {
#if defined(CONFIG_LITTLE_ENDIAN) #if defined(CONFIG_CPU_LITTLE_ENDIAN)
bufhi = current->thread.fpu.hard.fp_regs[srcreg]; bufhi = current->thread.fpu.hard.fp_regs[srcreg];
buflo = current->thread.fpu.hard.fp_regs[srcreg+1]; buflo = current->thread.fpu.hard.fp_regs[srcreg+1];
#else #else

2
arch/sh/kernel/vmlinux_64.lds.S
View file

@ -51,7 +51,7 @@ SECTIONS
KPROBES_TEXT KPROBES_TEXT
*(.fixup) *(.fixup)
*(.gnu.warning) *(.gnu.warning)
#ifdef CONFIG_LITTLE_ENDIAN #ifdef CONFIG_CPU_LITTLE_ENDIAN
} = 0x6ff0fff0 } = 0x6ff0fff0
#else #else
} = 0xf0fff06f } = 0xf0fff06f

6
include/asm-sh/cpu-sh5/mmu_context.h
View file

@ -16,12 +16,6 @@
/* This has to be a common function because the next location to fill /* This has to be a common function because the next location to fill
* information is shared. */ * information is shared. */
extern void __do_tlb_refill(unsigned long address, unsigned long long is_text_not_data, pte_t *pte); extern void __do_tlb_refill(unsigned long address, unsigned long long is_text_not_data, pte_t *pte);
/* Profiling counter. */
#ifdef CONFIG_SH64_PROC_TLB
extern unsigned long long calls_to_do_fast_page_fault;
#endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __ASM_SH_CPU_SH5_MMU_CONTEXT_H */ #endif /* __ASM_SH_CPU_SH5_MMU_CONTEXT_H */