korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-02 08:34:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

[MIPS] rbtx4927: Fix some gcc warnings and a section mismatch.

Browse Source 
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Atsushi Nemoto 2007-07-25 00:53:40 +09:00 committed by Ralf Baechle
parent d4414cc48b
commit 8449d399d2
3 changed files with 7 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/pci/fixup-rbtx4927.c
View File

@ -79,7 +79,7 @@ static unsigned char backplane_pci_irq[4][4] = {
TX4927_IRQ_IOC_PCIC} TX4927_IRQ_IOC_PCIC}
}; };
int pci_get_irq(struct pci_dev *dev, int pin) static int pci_get_irq(const struct pci_dev *dev, int pin)
{ {
unsigned char irq = pin; unsigned char irq = pin;

4
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
View File

@ -262,8 +262,6 @@ u32 bit2num(u32 num)
int toshiba_rbtx4927_irq_nested(int sw_irq) int toshiba_rbtx4927_irq_nested(int sw_irq)
{ {
u32 level3; u32 level3;
u32 level4;
u32 level5;
level3 = reg_rd08(TOSHIBA_RBTX4927_IOC_INTR_STAT) & 0x1f; level3 = reg_rd08(TOSHIBA_RBTX4927_IOC_INTR_STAT) & 0x1f;
if (level3) { if (level3) {
@ -275,6 +273,8 @@ int toshiba_rbtx4927_irq_nested(int sw_irq)
#ifdef CONFIG_TOSHIBA_FPCIB0 #ifdef CONFIG_TOSHIBA_FPCIB0
{ {
if (tx4927_using_backplane) { if (tx4927_using_backplane) {
u32 level4;
u32 level5;
outb(0x0A, 0x20); outb(0x0A, 0x20);
level4 = inb(0x20) & 0xff; level4 = inb(0x20) & 0xff;
if (level4) { if (level4) {

58
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
View File

@ -159,58 +159,6 @@ int tx4927_pci66 = 0; /* 0:auto */
char *toshiba_name = ""; char *toshiba_name = "";
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static void tx4927_pcierr_interrupt(int irq, void *dev_id)
{
#ifdef CONFIG_BLK_DEV_IDEPCI
/* ignore MasterAbort for ide probing... */
if (irq == TX4927_IRQ_IRC_PCIERR &&
((tx4927_pcicptr->pcistatus >> 16) & 0xf900) ==
PCI_STATUS_REC_MASTER_ABORT) {
tx4927_pcicptr->pcistatus =
(tx4927_pcicptr->
pcistatus & 0x0000ffff) | (PCI_STATUS_REC_MASTER_ABORT
<< 16);
return;
}
#endif
printk("PCI error interrupt (irq 0x%x).\n", irq);
printk("pcistat:%04x, g2pstatus:%08lx, pcicstatus:%08lx\n",
(unsigned short) (tx4927_pcicptr->pcistatus >> 16),
tx4927_pcicptr->g2pstatus, tx4927_pcicptr->pcicstatus);
printk("ccfg:%08lx, tear:%02lx_%08lx\n",
(unsigned long) tx4927_ccfgptr->ccfg,
(unsigned long) (tx4927_ccfgptr->tear >> 32),
(unsigned long) tx4927_ccfgptr->tear);
show_regs(get_irq_regs());
}
void __init toshiba_rbtx4927_pci_irq_init(void)
{
return;
}
void tx4927_reset_pci_pcic(void)
{
/* Reset PCI Bus */
*tx4927_pcireset_ptr = 1;
/* Reset PCIC */
tx4927_ccfgptr->clkctr |= TX4927_CLKCTR_PCIRST;
udelay(10000);
/* clear PCIC reset */
tx4927_ccfgptr->clkctr &= ~TX4927_CLKCTR_PCIRST;
*tx4927_pcireset_ptr = 0;
}
#endif /* CONFIG_PCI */
#ifdef CONFIG_PCI
void print_pci_status(void)
{
printk("PCI STATUS %lx\n", tx4927_pcicptr->pcistatus);
printk("PCIC STATUS %lx\n", tx4927_pcicptr->pcicstatus);
}
extern struct pci_controller tx4927_controller; extern struct pci_controller tx4927_controller;
static struct pci_dev *fake_pci_dev(struct pci_controller *hose, static struct pci_dev *fake_pci_dev(struct pci_controller *hose,
@ -239,10 +187,8 @@ static int early_##rw##_config_##size(struct pci_controller *hose, \
} }
EARLY_PCI_OP(read, byte, u8 *) EARLY_PCI_OP(read, byte, u8 *)
EARLY_PCI_OP(read, word, u16 *)
EARLY_PCI_OP(read, dword, u32 *) EARLY_PCI_OP(read, dword, u32 *)
EARLY_PCI_OP(write, byte, u8) EARLY_PCI_OP(write, byte, u8)
EARLY_PCI_OP(write, word, u16)
EARLY_PCI_OP(write, dword, u32) EARLY_PCI_OP(write, dword, u32)
static int __init tx4927_pcibios_init(void) static int __init tx4927_pcibios_init(void)
@ -269,7 +215,9 @@ static int __init tx4927_pcibios_init(void)
u8 v08_64; u8 v08_64;
u32 v32_b0; u32 v32_b0;
u8 v08_e1; u8 v08_e1;
#ifdef TOSHIBA_RBTX4927_SETUP_DEBUG
char *s = " sb/isa --"; char *s = " sb/isa --";
#endif
TOSHIBA_RBTX4927_SETUP_DPRINTK TOSHIBA_RBTX4927_SETUP_DPRINTK
(TOSHIBA_RBTX4927_SETUP_PCIBIOS, ":%s beg\n", (TOSHIBA_RBTX4927_SETUP_PCIBIOS, ":%s beg\n",
@ -354,7 +302,9 @@ static int __init tx4927_pcibios_init(void)
u8 v08_41; u8 v08_41;
u8 v08_43; u8 v08_43;
u8 v08_5c; u8 v08_5c;
#ifdef TOSHIBA_RBTX4927_SETUP_DEBUG
char *s = " sb/ide --"; char *s = " sb/ide --";
#endif
TOSHIBA_RBTX4927_SETUP_DPRINTK TOSHIBA_RBTX4927_SETUP_DPRINTK
(TOSHIBA_RBTX4927_SETUP_PCIBIOS, ":%s beg\n", (TOSHIBA_RBTX4927_SETUP_PCIBIOS, ":%s beg\n",