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

[MIPS] War on whitespace: cleanup initial spaces followed by tabs. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

+87 -86
+2 -2
arch/mips/au1000/common/dbdma.c
··· 214 214 if ( NULL != p ) 215 215 { 216 216 memcpy(p, dev, sizeof(dbdev_tab_t)); 217 - p->dev_id = DSCR_DEV2CUSTOM_ID(new_id,dev->dev_id); 217 + p->dev_id = DSCR_DEV2CUSTOM_ID(new_id,dev->dev_id); 218 218 ret = p->dev_id; 219 219 new_id++; 220 220 #if 0 ··· 260 260 spin_lock_irqsave(&au1xxx_dbdma_spin_lock, flags); 261 261 if (!(stp->dev_flags & DEV_FLAGS_INUSE) || 262 262 (stp->dev_flags & DEV_FLAGS_ANYUSE)) { 263 - /* Got source */ 263 + /* Got source */ 264 264 stp->dev_flags |= DEV_FLAGS_INUSE; 265 265 if (!(dtp->dev_flags & DEV_FLAGS_INUSE) || 266 266 (dtp->dev_flags & DEV_FLAGS_ANYUSE)) {
+1 -1
arch/mips/au1000/common/dma.c
··· 174 174 return -EINVAL; 175 175 #else 176 176 if (dev_id < 0 || dev_id >= DMA_NUM_DEV) 177 - return -EINVAL; 177 + return -EINVAL; 178 178 #endif 179 179 180 180 for (i = 0; i < NUM_AU1000_DMA_CHANNELS; i++) {
+2 -2
arch/mips/au1000/common/platform.c
··· 264 264 265 265 static struct platform_device smc91x_device = { 266 266 .name = "smc91x", 267 - .id = -1, 267 + .id = -1, 268 268 .num_resources = ARRAY_SIZE(smc91x_resources), 269 269 .resource = smc91x_resources, 270 270 }; ··· 288 288 &au1xxx_mmc_device, 289 289 #endif 290 290 #ifdef CONFIG_MIPS_DB1200 291 - &smc91x_device, 291 + &smc91x_device, 292 292 #endif 293 293 }; 294 294
+1 -1
arch/mips/au1000/common/setup.c
··· 90 90 else { 91 91 /* Clear to obtain best system bus performance */ 92 92 clear_c0_config(1<<19); /* Clear Config[OD] */ 93 - } 93 + } 94 94 95 95 argptr = prom_getcmdline(); 96 96
+1 -1
arch/mips/au1000/common/time.c
··· 359 359 : "hi", "lo", GCC_REG_ACCUM); 360 360 361 361 /* 362 - * Due to possible jiffies inconsistencies, we need to check 362 + * Due to possible jiffies inconsistencies, we need to check 363 363 * the result so that we'll get a timer that is monotonic. 364 364 */ 365 365 if (res >= USECS_PER_JIFFY)
+1 -1
arch/mips/dec/prom/memory.c
··· 45 45 */ 46 46 for (memory_page = (unsigned char *)CKSEG1 + CHUNK_SIZE; 47 47 mem_err == 0 && memory_page < (unsigned char *)CKSEG1 + 0x1e00000; 48 - memory_page += CHUNK_SIZE) { 48 + memory_page += CHUNK_SIZE) { 49 49 dummy = *memory_page; 50 50 } 51 51 memcpy((void *)(CKSEG0 + 0x80), &old_handler, 0x80);
+6 -6
arch/mips/jazz/int-handler.S
··· 248 248 and t2,s1 249 249 sh t2,JAZZ_IO_IRQ_ENABLE 250 250 251 - nor s1,zero,s1 251 + nor s1,zero,s1 252 252 jal do_IRQ 253 253 254 - /* 255 - * Reenable interrupt 256 - */ 254 + /* 255 + * Reenable interrupt 256 + */ 257 257 lhu t2,JAZZ_IO_IRQ_ENABLE 258 - or t2,s1 258 + or t2,s1 259 259 sh t2,JAZZ_IO_IRQ_ENABLE 260 260 261 - j ret_from_irq 261 + j ret_from_irq 262 262 263 263 /* 264 264 * "Jump extender" to reach spurious_interrupt
+3 -3
arch/mips/kernel/cpu-probe.c
··· 291 291 * for documentation. Commented out because it shares 292 292 * it's c0_prid id number with the TX3900. 293 293 */ 294 - c->cputype = CPU_R4650; 294 + c->cputype = CPU_R4650; 295 295 c->isa_level = MIPS_CPU_ISA_III; 296 296 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_LLSC; 297 297 c->tlbsize = 48; ··· 604 604 case PRID_IMP_AU1_REV2: 605 605 switch ((c->processor_id >> 24) & 0xff) { 606 606 case 0: 607 - c->cputype = CPU_AU1000; 607 + c->cputype = CPU_AU1000; 608 608 break; 609 609 case 1: 610 610 c->cputype = CPU_AU1500; ··· 705 705 break; 706 706 case PRID_COMP_PHILIPS: 707 707 cpu_probe_philips(c); 708 - break; 708 + break; 709 709 default: 710 710 c->cputype = CPU_UNKNOWN; 711 711 }
+1 -1
arch/mips/kernel/gdb-low.S
··· 41 41 */ 42 42 .align 5 43 43 NESTED(trap_low, GDB_FR_SIZE, sp) 44 - .set noat 44 + .set noat 45 45 .set noreorder 46 46 47 47 mfc0 k0, CP0_STATUS
+5 -5
arch/mips/kernel/signal-common.h
··· 166 166 sp = regs->regs[29]; 167 167 168 168 /* 169 - * FPU emulator may have it's own trampoline active just 170 - * above the user stack, 16-bytes before the next lowest 171 - * 16 byte boundary. Try to avoid trashing it. 172 - */ 173 - sp -= 32; 169 + * FPU emulator may have it's own trampoline active just 170 + * above the user stack, 16-bytes before the next lowest 171 + * 16 byte boundary. Try to avoid trashing it. 172 + */ 173 + sp -= 32; 174 174 175 175 /* This is the X/Open sanctioned signal stack switching. */ 176 176 if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags (sp) == 0))
+5 -5
arch/mips/kernel/signal32.c
··· 624 624 sp = regs->regs[29]; 625 625 626 626 /* 627 - * FPU emulator may have it's own trampoline active just 628 - * above the user stack, 16-bytes before the next lowest 629 - * 16 byte boundary. Try to avoid trashing it. 630 - */ 631 - sp -= 32; 627 + * FPU emulator may have it's own trampoline active just 628 + * above the user stack, 16-bytes before the next lowest 629 + * 16 byte boundary. Try to avoid trashing it. 630 + */ 631 + sp -= 32; 632 632 633 633 /* This is the X/Open sanctioned signal stack switching. */ 634 634 if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags (sp) == 0))
+1 -1
arch/mips/kernel/traps.c
··· 576 576 } 577 577 #endif 578 578 /* 579 - * Unimplemented operation exception. If we've got the full 579 + * Unimplemented operation exception. If we've got the full 580 580 * software emulator on-board, let's use it... 581 581 * 582 582 * Force FPU to dump state into task/thread context. We're
+3 -2
arch/mips/lasat/image/romscript.normal
··· 16 16 _image_start = ADDR(.data); 17 17 _image_size = SIZEOF(.data); 18 18 19 - .other : { 20 - *(.*) 19 + .other : 20 + { 21 + *(.*) 21 22 } 22 23 }
+1 -1
arch/mips/mips-boards/generic/mipsIRQ.S
··· 98 98 and s0, s1 99 99 100 100 #if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64) 101 - .set mips32 101 + .set mips32 102 102 clz a0, s0 103 103 .set mips0 104 104 negu a0
+1 -1
arch/mips/mips-boards/sim/sim_IRQ.c
··· 96 96 andi a0, s0, CAUSEF_IP3 # delay slot, check hw1 interrupt 97 97 #else 98 98 beq a0, zero, 1f # delay slot, check hw3 interrupt 99 - andi a0, s0, CAUSEF_IP5 99 + andi a0, s0, CAUSEF_IP5 100 100 #endif 101 101 102 102 /* Wheee, combined hardware level zero interrupt. */
+1 -1
arch/mips/mips-boards/sim/sim_irq.S
··· 42 42 and s0, s1 43 43 44 44 #if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64) 45 - .set mips32 45 + .set mips32 46 46 clz a0, s0 47 47 .set mips0 48 48 negu a0
+1 -1
arch/mips/mips-boards/sim/sim_smp.c
··· 115 115 #ifdef CONFIG_MIPS_MT_SMTC 116 116 void mipsmt_prepare_cpus(int c); 117 117 /* 118 - * As noted above, we can assume a single CPU for now 118 + * As noted above, we can assume a single CPU for now 119 119 * but it may be multithreaded. 120 120 */ 121 121
+9 -9
arch/mips/mm/c-r3k.c
··· 129 129 "sb\t$0, 0x014(%0)\n\t" 130 130 "sb\t$0, 0x018(%0)\n\t" 131 131 "sb\t$0, 0x01c(%0)\n\t" 132 - "sb\t$0, 0x020(%0)\n\t" 132 + "sb\t$0, 0x020(%0)\n\t" 133 133 "sb\t$0, 0x024(%0)\n\t" 134 134 "sb\t$0, 0x028(%0)\n\t" 135 135 "sb\t$0, 0x02c(%0)\n\t" ··· 145 145 "sb\t$0, 0x054(%0)\n\t" 146 146 "sb\t$0, 0x058(%0)\n\t" 147 147 "sb\t$0, 0x05c(%0)\n\t" 148 - "sb\t$0, 0x060(%0)\n\t" 148 + "sb\t$0, 0x060(%0)\n\t" 149 149 "sb\t$0, 0x064(%0)\n\t" 150 150 "sb\t$0, 0x068(%0)\n\t" 151 151 "sb\t$0, 0x06c(%0)\n\t" ··· 182 182 "sb\t$0, 0x004(%0)\n\t" 183 183 "sb\t$0, 0x008(%0)\n\t" 184 184 "sb\t$0, 0x00c(%0)\n\t" 185 - "sb\t$0, 0x010(%0)\n\t" 185 + "sb\t$0, 0x010(%0)\n\t" 186 186 "sb\t$0, 0x014(%0)\n\t" 187 187 "sb\t$0, 0x018(%0)\n\t" 188 188 "sb\t$0, 0x01c(%0)\n\t" 189 - "sb\t$0, 0x020(%0)\n\t" 189 + "sb\t$0, 0x020(%0)\n\t" 190 190 "sb\t$0, 0x024(%0)\n\t" 191 191 "sb\t$0, 0x028(%0)\n\t" 192 192 "sb\t$0, 0x02c(%0)\n\t" 193 - "sb\t$0, 0x030(%0)\n\t" 193 + "sb\t$0, 0x030(%0)\n\t" 194 194 "sb\t$0, 0x034(%0)\n\t" 195 195 "sb\t$0, 0x038(%0)\n\t" 196 196 "sb\t$0, 0x03c(%0)\n\t" 197 - "sb\t$0, 0x040(%0)\n\t" 197 + "sb\t$0, 0x040(%0)\n\t" 198 198 "sb\t$0, 0x044(%0)\n\t" 199 199 "sb\t$0, 0x048(%0)\n\t" 200 200 "sb\t$0, 0x04c(%0)\n\t" 201 - "sb\t$0, 0x050(%0)\n\t" 201 + "sb\t$0, 0x050(%0)\n\t" 202 202 "sb\t$0, 0x054(%0)\n\t" 203 203 "sb\t$0, 0x058(%0)\n\t" 204 204 "sb\t$0, 0x05c(%0)\n\t" 205 - "sb\t$0, 0x060(%0)\n\t" 205 + "sb\t$0, 0x060(%0)\n\t" 206 206 "sb\t$0, 0x064(%0)\n\t" 207 207 "sb\t$0, 0x068(%0)\n\t" 208 208 "sb\t$0, 0x06c(%0)\n\t" 209 - "sb\t$0, 0x070(%0)\n\t" 209 + "sb\t$0, 0x070(%0)\n\t" 210 210 "sb\t$0, 0x074(%0)\n\t" 211 211 "sb\t$0, 0x078(%0)\n\t" 212 212 "sb\t$0, 0x07c(%0)\n\t"
+1 -1
arch/mips/momentum/jaguar_atx/reset.c
··· 32 32 #else 33 33 void *nvram = (void*) 0xfc807000; 34 34 #endif 35 - /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */ 35 + /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */ 36 36 writeb(0x84, nvram + 0xff7); 37 37 38 38 /* wait for the watchdog to go off */
+1 -1
arch/mips/momentum/jaguar_atx/setup.c
··· 461 461 unsigned int tbControl; 462 462 tbControl = 463 463 0 << 26 | /* post trigger delay 0 */ 464 - 0x2 << 16 | /* sequential trace mode */ 464 + 0x2 << 16 | /* sequential trace mode */ 465 465 // 0x0 << 16 | /* non-sequential trace mode */ 466 466 // 0xf << 4 | /* watchpoints disabled */ 467 467 2 << 2 | /* armed */
+1 -1
arch/mips/momentum/ocelot_3/reset.c
··· 34 34 /* base address of timekeeper portion of part */ 35 35 void *nvram = (void *) 0xfc807000L; 36 36 37 - /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */ 37 + /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */ 38 38 writeb(0x84, nvram + 0xff7); 39 39 40 40 /* wait for the watchdog to go off */
+1 -1
arch/mips/momentum/ocelot_c/reset.c
··· 34 34 0xfc807000; 35 35 #endif 36 36 37 - /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */ 37 + /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */ 38 38 writeb(0x84, nvram + 0xff7); 39 39 40 40 /* wait for the watchdog to go off */
+1 -1
arch/mips/pci/fixup-vr4133.c
··· 45 45 46 46 /* 47 47 * we have to open the bridges' windows down to 0 because otherwise 48 - * we cannot access ISA south bridge I/O registers that get mapped from 48 + * we cannot access ISA south bridge I/O registers that get mapped from 49 49 * 0. for example, 8259 PIC would be unaccessible without that 50 50 */ 51 51 if(dev->vendor == PCI_VENDOR_ID_INTEL && dev->device == PCI_DEVICE_ID_INTEL_S21152BB) {
+2 -2
arch/mips/pci/ops-ddb5477.c
··· 253 253 static int prefix##_##rw##_config(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 star val) \ 254 254 { \ 255 255 if (size == 1) \ 256 - return rw##_config_byte(pciswap, bus, devfn, where, (u8 star)val); \ 256 + return rw##_config_byte(pciswap, bus, devfn, where, (u8 star)val); \ 257 257 else if (size == 2) \ 258 - return rw##_config_word(pciswap, bus, devfn, where, (u16 star)val); \ 258 + return rw##_config_word(pciswap, bus, devfn, where, (u16 star)val); \ 259 259 /* Size must be 4 */ \ 260 260 return rw##_config_dword(pciswap, bus, devfn, where, val); \ 261 261 }
+8 -8
arch/mips/pci/ops-tx4938.c
··· 34 34 }; 35 35 36 36 struct resource tx4938_pcic1_pci_io_resource = { 37 - .name = "PCI1 IO", 38 - .start = 0, 39 - .end = 0, 40 - .flags = IORESOURCE_IO 37 + .name = "PCI1 IO", 38 + .start = 0, 39 + .end = 0, 40 + .flags = IORESOURCE_IO 41 41 }; 42 42 struct resource tx4938_pcic1_pci_mem_resource = { 43 - .name = "PCI1 mem", 44 - .start = 0, 45 - .end = 0, 46 - .flags = IORESOURCE_MEM 43 + .name = "PCI1 mem", 44 + .start = 0, 45 + .end = 0, 46 + .flags = IORESOURCE_MEM 47 47 }; 48 48 49 49 static int mkaddr(int bus, int dev_fn, int where, int *flagsp)
+1 -1
arch/mips/pci/pci-bcm1480.c
··· 100 100 101 101 if (bus->number == 0) { 102 102 devno = PCI_SLOT(devfn); 103 - if (bcm1480_bus_status & PCI_DEVICE_MODE) 103 + if (bcm1480_bus_status & PCI_DEVICE_MODE) 104 104 return 0; 105 105 else 106 106 return 1;
+1 -1
arch/mips/pci/pci-bcm1480ht.c
··· 95 95 96 96 if (bus->number == 0) { 97 97 devno = PCI_SLOT(devfn); 98 - if (bcm1480ht_bus_status & PCI_DEVICE_MODE) 98 + if (bcm1480ht_bus_status & PCI_DEVICE_MODE) 99 99 return 0; 100 100 } 101 101 return 1;
+6 -6
arch/mips/pci/pci-ip27.c
··· 379 379 bridge = (bridge_t *) RAW_NODE_SWIN_BASE(nasid, widget_id); 380 380 381 381 /* 382 - * Clear all pending interrupts. 383 - */ 382 + * Clear all pending interrupts. 383 + */ 384 384 bridge->b_int_rst_stat = BRIDGE_IRR_ALL_CLR; 385 385 386 386 /* 387 - * Until otherwise set up, assume all interrupts are from slot 0 388 - */ 387 + * Until otherwise set up, assume all interrupts are from slot 0 388 + */ 389 389 bridge->b_int_device = 0x0; 390 390 391 391 /* 392 - * swap pio's to pci mem and io space (big windows) 393 - */ 392 + * swap pio's to pci mem and io space (big windows) 393 + */ 394 394 bridge->b_wid_control |= BRIDGE_CTRL_IO_SWAP | 395 395 BRIDGE_CTRL_MEM_SWAP; 396 396
+1 -1
arch/mips/philips/pnx8550/common/int.c
··· 251 251 if (gic_int_line == (PNX8550_INT_GPIO0 - PNX8550_INT_GIC_MIN)) { 252 252 /* PCI INT through gpio 8, which is setup in 253 253 * pnx8550_setup.c and routed to GPIO 254 - * Interrupt Level 0 (GPIO Connection 58). 254 + * Interrupt Level 0 (GPIO Connection 58). 255 255 * Set it active low. */ 256 256 257 257 PNX8550_GIC_REQ(gic_int_line) = 0x1E020000;
+2 -2
arch/mips/sgi-ip27/ip27-memory.c
··· 540 540 struct page *end, *p; 541 541 542 542 /* 543 - * This will free up the bootmem, ie, slot 0 memory. 544 - */ 543 + * This will free up the bootmem, ie, slot 0 memory. 544 + */ 545 545 totalram_pages += free_all_bootmem_node(NODE_DATA(node)); 546 546 547 547 /*
+1 -1
arch/mips/sgi-ip32/ip32-setup.c
··· 98 98 board_timer_setup = ip32_timer_setup; 99 99 100 100 #ifdef CONFIG_SERIAL_8250 101 - { 101 + { 102 102 static struct uart_port o2_serial[2]; 103 103 104 104 memset(o2_serial, 0, sizeof(o2_serial));
+2 -2
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
··· 70 70 71 71 if ((read_c0_prid() & 0xff) == PRID_REV_TX4927) { 72 72 mips_machtype = MACH_TOSHIBA_RBTX4927; 73 - toshiba_name = "TX4927"; 73 + toshiba_name = "TX4927"; 74 74 } else { 75 75 mips_machtype = MACH_TOSHIBA_RBTX4937; 76 - toshiba_name = "TX4937"; 76 + toshiba_name = "TX4937"; 77 77 } 78 78 79 79 msize = tx4927_get_mem_size();
+1 -1
arch/mips/tx4938/toshiba_rbtx4938/setup.c
··· 684 684 for (i = 0; i < 8; i++) { 685 685 if (!(tx4938_ebuscptr->cr[i] & 0x8)) 686 686 continue; /* disabled */ 687 - rbtx4938_ce_base[i] = (unsigned long)TX4938_EBUSC_BA(i); 687 + rbtx4938_ce_base[i] = (unsigned long)TX4938_EBUSC_BA(i); 688 688 txboard_add_phys_region(rbtx4938_ce_base[i], TX4938_EBUSC_SIZE(i)); 689 689 } 690 690
+3 -3
arch/mips/vr41xx/common/bcu.c
··· 183 183 switch (current_cpu_data.cputype) { 184 184 case CPU_VR4111: 185 185 if (!(clkspeed & DIV2B)) 186 - tclock = pclock / 2; 186 + tclock = pclock / 2; 187 187 else if (!(clkspeed & DIV3B)) 188 - tclock = pclock / 3; 188 + tclock = pclock / 3; 189 189 else if (!(clkspeed & DIV4B)) 190 - tclock = pclock / 4; 190 + tclock = pclock / 4; 191 191 break; 192 192 case CPU_VR4121: 193 193 tclock = pclock / DIVT(clkspeed);
+1 -1
include/asm-mips/pgtable-32.h
··· 206 206 /* fixme */ 207 207 #define pte_to_pgoff(_pte) (((_pte).pte_high >> 6) + ((_pte).pte_high & 0x3f)) 208 208 #define pgoff_to_pte(off) \ 209 - ((pte_t){(((off) & 0x3f) + ((off) << 6) + _PAGE_FILE)}) 209 + ((pte_t){(((off) & 0x3f) + ((off) << 6) + _PAGE_FILE)}) 210 210 211 211 #else 212 212 #define pte_to_pgoff(_pte) \
+1 -1
include/asm-mips/sn/klconfig.h
··· 99 99 #define ENABLE_BOARD 0x01 100 100 #define FAILED_BOARD 0x02 101 101 #define DUPLICATE_BOARD 0x04 /* Boards like midplanes/routers which 102 - are discovered twice. Use one of them */ 102 + are discovered twice. Use one of them */ 103 103 #define VISITED_BOARD 0x08 /* Used for compact hub numbering. */ 104 104 #define LOCAL_MASTER_IO6 0x10 /* master io6 for that node */ 105 105 #define GLOBAL_MASTER_IO6 0x20
+6 -6
include/asm-mips/sn/sn0/hubio.h
··· 229 229 icsr_llp_en: 1, /* LLP enable bit */ 230 230 icsr_rsvd2: 1, /* reserver */ 231 231 icsr_wrm_reset: 1, /* Warm reset bit */ 232 - icsr_rsvd1: 2, /* Data ready offset */ 232 + icsr_rsvd1: 2, /* Data ready offset */ 233 233 icsr_null_to: 6; /* Null timeout */ 234 234 235 235 } icsr_fields_s; ··· 274 274 u64 perf_sel_reg; 275 275 struct { 276 276 u64 perf_rsvd : 48, 277 - perf_icct : 8, 278 - perf_ippr1 : 4, 279 - perf_ippr0 : 4; 277 + perf_icct : 8, 278 + perf_ippr1 : 4, 279 + perf_ippr0 : 4; 280 280 } perf_sel_bits; 281 281 } io_perf_sel_t; 282 282 ··· 287 287 u64 perf_cnt; 288 288 struct { 289 289 u64 perf_rsvd1 : 32, 290 - perf_rsvd2 : 12, 291 - perf_cnt : 20; 290 + perf_rsvd2 : 12, 291 + perf_cnt : 20; 292 292 } perf_cnt_bits; 293 293 } io_perf_cnt_t; 294 294
+1 -1
include/asm-mips/thread_info.h
··· 31 31 int preempt_count; /* 0 => preemptable, <0 => BUG */ 32 32 33 33 mm_segment_t addr_limit; /* thread address space: 34 - 0-0xBFFFFFFF for user-thead 34 + 0-0xBFFFFFFF for user-thead 35 35 0-0xFFFFFFFF for kernel-thread 36 36 */ 37 37 struct restart_block restart_block;