Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Atsushi Nemoto and committed by
Ralf Baechle
8449d399 d4414cc4

+7 -57
+1 -1
arch/mips/pci/fixup-rbtx4927.c
··· 79 79 TX4927_IRQ_IOC_PCIC} 80 80 }; 81 81 82 - int pci_get_irq(struct pci_dev *dev, int pin) 82 + static int pci_get_irq(const struct pci_dev *dev, int pin) 83 83 { 84 84 unsigned char irq = pin; 85 85
+2 -2
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
··· 262 262 int toshiba_rbtx4927_irq_nested(int sw_irq) 263 263 { 264 264 u32 level3; 265 - u32 level4; 266 - u32 level5; 267 265 268 266 level3 = reg_rd08(TOSHIBA_RBTX4927_IOC_INTR_STAT) & 0x1f; 269 267 if (level3) { ··· 273 275 #ifdef CONFIG_TOSHIBA_FPCIB0 274 276 { 275 277 if (tx4927_using_backplane) { 278 + u32 level4; 279 + u32 level5; 276 280 outb(0x0A, 0x20); 277 281 level4 = inb(0x20) & 0xff; 278 282 if (level4) {
+4 -54
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
··· 159 159 char *toshiba_name = ""; 160 160 161 161 #ifdef CONFIG_PCI 162 - static void tx4927_pcierr_interrupt(int irq, void *dev_id) 163 - { 164 - #ifdef CONFIG_BLK_DEV_IDEPCI 165 - /* ignore MasterAbort for ide probing... */ 166 - if (irq == TX4927_IRQ_IRC_PCIERR && 167 - ((tx4927_pcicptr->pcistatus >> 16) & 0xf900) == 168 - PCI_STATUS_REC_MASTER_ABORT) { 169 - tx4927_pcicptr->pcistatus = 170 - (tx4927_pcicptr-> 171 - pcistatus & 0x0000ffff) | (PCI_STATUS_REC_MASTER_ABORT 172 - << 16); 173 - 174 - return; 175 - } 176 - #endif 177 - printk("PCI error interrupt (irq 0x%x).\n", irq); 178 - 179 - printk("pcistat:%04x, g2pstatus:%08lx, pcicstatus:%08lx\n", 180 - (unsigned short) (tx4927_pcicptr->pcistatus >> 16), 181 - tx4927_pcicptr->g2pstatus, tx4927_pcicptr->pcicstatus); 182 - printk("ccfg:%08lx, tear:%02lx_%08lx\n", 183 - (unsigned long) tx4927_ccfgptr->ccfg, 184 - (unsigned long) (tx4927_ccfgptr->tear >> 32), 185 - (unsigned long) tx4927_ccfgptr->tear); 186 - show_regs(get_irq_regs()); 187 - } 188 - 189 - void __init toshiba_rbtx4927_pci_irq_init(void) 190 - { 191 - return; 192 - } 193 - 194 - void tx4927_reset_pci_pcic(void) 195 - { 196 - /* Reset PCI Bus */ 197 - *tx4927_pcireset_ptr = 1; 198 - /* Reset PCIC */ 199 - tx4927_ccfgptr->clkctr |= TX4927_CLKCTR_PCIRST; 200 - udelay(10000); 201 - /* clear PCIC reset */ 202 - tx4927_ccfgptr->clkctr &= ~TX4927_CLKCTR_PCIRST; 203 - *tx4927_pcireset_ptr = 0; 204 - } 205 - #endif /* CONFIG_PCI */ 206 - 207 - #ifdef CONFIG_PCI 208 - void print_pci_status(void) 209 - { 210 - printk("PCI STATUS %lx\n", tx4927_pcicptr->pcistatus); 211 - printk("PCIC STATUS %lx\n", tx4927_pcicptr->pcicstatus); 212 - } 213 - 214 162 extern struct pci_controller tx4927_controller; 215 163 216 164 static struct pci_dev *fake_pci_dev(struct pci_controller *hose, ··· 187 239 } 188 240 189 241 EARLY_PCI_OP(read, byte, u8 *) 190 - EARLY_PCI_OP(read, word, u16 *) 191 242 EARLY_PCI_OP(read, dword, u32 *) 192 243 EARLY_PCI_OP(write, byte, u8) 193 - EARLY_PCI_OP(write, word, u16) 194 244 EARLY_PCI_OP(write, dword, u32) 195 245 196 246 static int __init tx4927_pcibios_init(void) ··· 215 269 u8 v08_64; 216 270 u32 v32_b0; 217 271 u8 v08_e1; 272 + #ifdef TOSHIBA_RBTX4927_SETUP_DEBUG 218 273 char *s = " sb/isa --"; 274 + #endif 219 275 220 276 TOSHIBA_RBTX4927_SETUP_DPRINTK 221 277 (TOSHIBA_RBTX4927_SETUP_PCIBIOS, ":%s beg\n", ··· 302 354 u8 v08_41; 303 355 u8 v08_43; 304 356 u8 v08_5c; 357 + #ifdef TOSHIBA_RBTX4927_SETUP_DEBUG 305 358 char *s = " sb/ide --"; 359 + #endif 306 360 307 361 TOSHIBA_RBTX4927_SETUP_DPRINTK 308 362 (TOSHIBA_RBTX4927_SETUP_PCIBIOS, ":%s beg\n",