Loading arch/sh/cchips/hd6446x/hd64465/setup.c +14 −33 Original line number Diff line number Diff line Loading @@ -17,10 +17,8 @@ #include <linux/interrupt.h> #include <linux/init.h> #include <linux/irq.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/hd64465/hd64465.h> static void disable_hd64465_irq(unsigned int irq) Loading @@ -34,7 +32,6 @@ static void disable_hd64465_irq(unsigned int irq) outw(nimr, HD64465_REG_NIMR); } static void enable_hd64465_irq(unsigned int irq) { unsigned short nimr; Loading @@ -46,33 +43,28 @@ static void enable_hd64465_irq(unsigned int irq) outw(nimr, HD64465_REG_NIMR); } static void mask_and_ack_hd64465(unsigned int irq) { disable_hd64465_irq(irq); } static void end_hd64465_irq(unsigned int irq) { if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) enable_hd64465_irq(irq); } static unsigned int startup_hd64465_irq(unsigned int irq) { enable_hd64465_irq(irq); return 0; } static void shutdown_hd64465_irq(unsigned int irq) { disable_hd64465_irq(irq); } static struct hw_interrupt_type hd64465_irq_type = { .typename = "HD64465-IRQ", .startup = startup_hd64465_irq, Loading @@ -83,7 +75,6 @@ static struct hw_interrupt_type hd64465_irq_type = { .end = end_hd64465_irq, }; static irqreturn_t hd64465_interrupt(int irq, void *dev_id) { printk(KERN_INFO Loading @@ -93,9 +84,6 @@ static irqreturn_t hd64465_interrupt(int irq, void *dev_id) return IRQ_NONE; } /*====================================================*/ /* * Support for a secondary IRQ demux step. This is necessary * because the HD64465 presents a very thin interface to the Loading @@ -103,8 +91,7 @@ static irqreturn_t hd64465_interrupt(int irq, void *dev_id) * normally done in hardware by other PCMCIA host bridges is * instead done in software. */ static struct { static struct { int (*func)(int, void *); void *dev; } hd64465_demux[HD64465_IRQ_NUM]; Loading @@ -123,8 +110,6 @@ void hd64465_unregister_irq_demux(int irq) } EXPORT_SYMBOL(hd64465_unregister_irq_demux); int hd64465_irq_demux(int irq) { if (irq == CONFIG_HD64465_IRQ) { Loading Loading @@ -154,7 +139,6 @@ static struct irqaction irq0 = { .name = "HD64465", }; static int __init setup_hd64465(void) { int i; Loading Loading @@ -185,16 +169,13 @@ static int __init setup_hd64465(void) setup_irq(CONFIG_HD64465_IRQ, &irq0); #ifdef CONFIG_SERIAL /* wake up the UART from STANDBY at this point */ smscr = inw(HD64465_REG_SMSCR); outw(smscr & (~HD64465_SMSCR_UARTST), HD64465_REG_SMSCR); /* remap IO ports for first ISA serial port to HD64465 UART */ hd64465_port_map(0x3f8, 8, CONFIG_HD64465_IOBASE + 0x8000, 1); #endif return 0; } module_init(setup_hd64465); arch/sh/configs/se7705_defconfig +0 −1 Original line number Diff line number Diff line Loading @@ -231,7 +231,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y # CONFIG_SH_DSP is not set # CONFIG_SH_ADC is not set CONFIG_CPU_HAS_INTEVT=y CONFIG_CPU_HAS_PINT_IRQ=y CONFIG_CPU_HAS_IPR_IRQ=y CONFIG_CPU_HAS_SR_RB=y Loading arch/sh/kernel/irq.c +0 −3 Original line number Diff line number Diff line Loading @@ -248,9 +248,6 @@ asmlinkage void do_softirq(void) void __init init_IRQ(void) { #ifdef CONFIG_CPU_HAS_PINT_IRQ init_IRQ_pint(); #endif plat_irq_setup(); /* Perform the machine specific initialisation */ Loading arch/sh/kernel/traps_64.c +2 −2 Original line number Diff line number Diff line Loading @@ -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+1] = bufhi; } 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+1] = buflo; #else Loading Loading @@ -700,7 +700,7 @@ static int misaligned_fpu_store(struct pt_regs *regs, buflo = current->thread.fpu.hard.fp_regs[srcreg]; bufhi = current->thread.fpu.hard.fp_regs[srcreg+1]; } else { #if defined(CONFIG_LITTLE_ENDIAN) #if defined(CONFIG_CPU_LITTLE_ENDIAN) bufhi = current->thread.fpu.hard.fp_regs[srcreg]; buflo = current->thread.fpu.hard.fp_regs[srcreg+1]; #else Loading arch/sh/kernel/vmlinux_64.lds.S +1 −1 Original line number Diff line number Diff line Loading @@ -51,7 +51,7 @@ SECTIONS KPROBES_TEXT *(.fixup) *(.gnu.warning) #ifdef CONFIG_LITTLE_ENDIAN #ifdef CONFIG_CPU_LITTLE_ENDIAN } = 0x6ff0fff0 #else } = 0xf0fff06f Loading Loading
arch/sh/cchips/hd6446x/hd64465/setup.c +14 −33 Original line number Diff line number Diff line Loading @@ -17,10 +17,8 @@ #include <linux/interrupt.h> #include <linux/init.h> #include <linux/irq.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/hd64465/hd64465.h> static void disable_hd64465_irq(unsigned int irq) Loading @@ -34,7 +32,6 @@ static void disable_hd64465_irq(unsigned int irq) outw(nimr, HD64465_REG_NIMR); } static void enable_hd64465_irq(unsigned int irq) { unsigned short nimr; Loading @@ -46,33 +43,28 @@ static void enable_hd64465_irq(unsigned int irq) outw(nimr, HD64465_REG_NIMR); } static void mask_and_ack_hd64465(unsigned int irq) { disable_hd64465_irq(irq); } static void end_hd64465_irq(unsigned int irq) { if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) enable_hd64465_irq(irq); } static unsigned int startup_hd64465_irq(unsigned int irq) { enable_hd64465_irq(irq); return 0; } static void shutdown_hd64465_irq(unsigned int irq) { disable_hd64465_irq(irq); } static struct hw_interrupt_type hd64465_irq_type = { .typename = "HD64465-IRQ", .startup = startup_hd64465_irq, Loading @@ -83,7 +75,6 @@ static struct hw_interrupt_type hd64465_irq_type = { .end = end_hd64465_irq, }; static irqreturn_t hd64465_interrupt(int irq, void *dev_id) { printk(KERN_INFO Loading @@ -93,9 +84,6 @@ static irqreturn_t hd64465_interrupt(int irq, void *dev_id) return IRQ_NONE; } /*====================================================*/ /* * Support for a secondary IRQ demux step. This is necessary * because the HD64465 presents a very thin interface to the Loading @@ -103,8 +91,7 @@ static irqreturn_t hd64465_interrupt(int irq, void *dev_id) * normally done in hardware by other PCMCIA host bridges is * instead done in software. */ static struct { static struct { int (*func)(int, void *); void *dev; } hd64465_demux[HD64465_IRQ_NUM]; Loading @@ -123,8 +110,6 @@ void hd64465_unregister_irq_demux(int irq) } EXPORT_SYMBOL(hd64465_unregister_irq_demux); int hd64465_irq_demux(int irq) { if (irq == CONFIG_HD64465_IRQ) { Loading Loading @@ -154,7 +139,6 @@ static struct irqaction irq0 = { .name = "HD64465", }; static int __init setup_hd64465(void) { int i; Loading Loading @@ -185,16 +169,13 @@ static int __init setup_hd64465(void) setup_irq(CONFIG_HD64465_IRQ, &irq0); #ifdef CONFIG_SERIAL /* wake up the UART from STANDBY at this point */ smscr = inw(HD64465_REG_SMSCR); outw(smscr & (~HD64465_SMSCR_UARTST), HD64465_REG_SMSCR); /* remap IO ports for first ISA serial port to HD64465 UART */ hd64465_port_map(0x3f8, 8, CONFIG_HD64465_IOBASE + 0x8000, 1); #endif return 0; } module_init(setup_hd64465);
arch/sh/configs/se7705_defconfig +0 −1 Original line number Diff line number Diff line Loading @@ -231,7 +231,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y # CONFIG_SH_DSP is not set # CONFIG_SH_ADC is not set CONFIG_CPU_HAS_INTEVT=y CONFIG_CPU_HAS_PINT_IRQ=y CONFIG_CPU_HAS_IPR_IRQ=y CONFIG_CPU_HAS_SR_RB=y Loading
arch/sh/kernel/irq.c +0 −3 Original line number Diff line number Diff line Loading @@ -248,9 +248,6 @@ asmlinkage void do_softirq(void) void __init init_IRQ(void) { #ifdef CONFIG_CPU_HAS_PINT_IRQ init_IRQ_pint(); #endif plat_irq_setup(); /* Perform the machine specific initialisation */ Loading
arch/sh/kernel/traps_64.c +2 −2 Original line number Diff line number Diff line Loading @@ -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+1] = bufhi; } 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+1] = buflo; #else Loading Loading @@ -700,7 +700,7 @@ static int misaligned_fpu_store(struct pt_regs *regs, buflo = current->thread.fpu.hard.fp_regs[srcreg]; bufhi = current->thread.fpu.hard.fp_regs[srcreg+1]; } else { #if defined(CONFIG_LITTLE_ENDIAN) #if defined(CONFIG_CPU_LITTLE_ENDIAN) bufhi = current->thread.fpu.hard.fp_regs[srcreg]; buflo = current->thread.fpu.hard.fp_regs[srcreg+1]; #else Loading
arch/sh/kernel/vmlinux_64.lds.S +1 −1 Original line number Diff line number Diff line Loading @@ -51,7 +51,7 @@ SECTIONS KPROBES_TEXT *(.fixup) *(.gnu.warning) #ifdef CONFIG_LITTLE_ENDIAN #ifdef CONFIG_CPU_LITTLE_ENDIAN } = 0x6ff0fff0 #else } = 0xf0fff06f Loading