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

irda: w83977af_ir: fix damaged whitespace

As David Miller pointed out for for the previous patch, the whitespace
in some functions looks rather odd. This was caused by commit 6329da5f258a
("obsolete config in kernel source: USE_INTERNAL_TIMER"), which removed
some conditions but did not reindent the code.

This fixes the indentation in the file and removes extraneous whitespace
at the end of the lines and before tabs.

There are many other minor coding style problems in the driver, but I'm
not touching those here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Arnd Bergmann and committed by
David S. Miller
7b2024fd c6c60dae

+202 -202
+202 -202
drivers/net/irda/w83977af_ir.c
··· 1 1 /********************************************************************* 2 - * 2 + * 3 3 * Filename: w83977af_ir.c 4 4 * Version: 1.0 5 5 * Description: FIR driver for the Winbond W83977AF Super I/O chip ··· 8 8 * Created at: Wed Nov 4 11:46:16 1998 9 9 * Modified at: Fri Jan 28 12:10:59 2000 10 10 * Modified by: Dag Brattli <dagb@cs.uit.no> 11 - * 11 + * 12 12 * Copyright (c) 1998-2000 Dag Brattli <dagb@cs.uit.no> 13 13 * Copyright (c) 1998-1999 Rebel.com 14 - * 15 - * This program is free software; you can redistribute it and/or 16 - * modify it under the terms of the GNU General Public License as 17 - * published by the Free Software Foundation; either version 2 of 14 + * 15 + * This program is free software; you can redistribute it and/or 16 + * modify it under the terms of the GNU General Public License as 17 + * published by the Free Software Foundation; either version 2 of 18 18 * the License, or (at your option) any later version. 19 - * 19 + * 20 20 * Neither Paul VanderSpek nor Rebel.com admit liability nor provide 21 21 * warranty for any of this software. This material is provided "AS-IS" 22 22 * and at no charge. 23 - * 23 + * 24 24 * If you find bugs in this file, its very likely that the same bug 25 25 * will also be in pc87108.c since the implementations are quite 26 26 * similar. 27 27 * 28 28 * Notice that all functions that needs to access the chip in _any_ 29 - * way, must save BSR register on entry, and restore it on exit. 29 + * way, must save BSR register on entry, and restore it on exit. 30 30 * It is _very_ important to follow this policy! 31 31 * 32 32 * __u8 bank; 33 - * 33 + * 34 34 * bank = inb( iobase+BSR); 35 - * 35 + * 36 36 * do_your_stuff_here(); 37 37 * 38 38 * outb( bank, iobase+BSR); ··· 63 63 #include "w83977af_ir.h" 64 64 65 65 #define CONFIG_USE_W977_PNP /* Currently needed */ 66 - #define PIO_MAX_SPEED 115200 66 + #define PIO_MAX_SPEED 115200 67 67 68 68 static char *driver_name = "w83977af_ir"; 69 69 static int qos_mtt_bits = 0x07; /* 1 ms or more */ ··· 83 83 static struct w83977af_ir *dev_self[] = { NULL, NULL, NULL, NULL}; 84 84 85 85 /* Some prototypes */ 86 - static int w83977af_open(int i, unsigned int iobase, unsigned int irq, 86 + static int w83977af_open(int i, unsigned int iobase, unsigned int irq, 87 87 unsigned int dma); 88 88 static int w83977af_close(struct w83977af_ir *self); 89 89 static int w83977af_probe(int iobase, int irq, int dma); 90 - static int w83977af_dma_receive(struct w83977af_ir *self); 90 + static int w83977af_dma_receive(struct w83977af_ir *self); 91 91 static int w83977af_dma_receive_complete(struct w83977af_ir *self); 92 92 static netdev_tx_t w83977af_hard_xmit(struct sk_buff *skb, 93 93 struct net_device *dev); ··· 108 108 */ 109 109 static int __init w83977af_init(void) 110 110 { 111 - int i; 111 + int i; 112 112 113 113 for (i=0; i < ARRAY_SIZE(dev_self) && io[i] < 2000; i++) { 114 114 if (w83977af_open(i, io[i], irq[i], dma[i]) == 0) ··· 150 150 unsigned int dma) 151 151 { 152 152 struct net_device *dev; 153 - struct w83977af_ir *self; 153 + struct w83977af_ir *self; 154 154 int err; 155 155 156 156 /* Lock the port that we need */ ··· 177 177 178 178 self = netdev_priv(dev); 179 179 spin_lock_init(&self->lock); 180 - 180 + 181 181 182 182 /* Initialize IO */ 183 - self->io.fir_base = iobase; 184 - self->io.irq = irq; 185 - self->io.fir_ext = CHIP_IO_EXTENT; 186 - self->io.dma = dma; 187 - self->io.fifo_size = 32; 183 + self->io.fir_base = iobase; 184 + self->io.irq = irq; 185 + self->io.fir_ext = CHIP_IO_EXTENT; 186 + self->io.dma = dma; 187 + self->io.fifo_size = 32; 188 188 189 189 /* Initialize QoS for this device */ 190 190 irda_init_max_qos_capabilies(&self->qos); 191 - 191 + 192 192 /* The only value we must override it the baudrate */ 193 193 194 194 /* FIXME: The HP HDLS-1100 does not support 1152000! */ ··· 198 198 /* The HP HDLS-1100 needs 1 ms according to the specs */ 199 199 self->qos.min_turn_time.bits = qos_mtt_bits; 200 200 irda_qos_bits_to_value(&self->qos); 201 - 201 + 202 202 /* Max DMA buffer size needed = (data_size + 6) * (window_size) + 6; */ 203 - self->rx_buff.truesize = 14384; 203 + self->rx_buff.truesize = 14384; 204 204 self->tx_buff.truesize = 4000; 205 - 205 + 206 206 /* Allocate memory if needed */ 207 207 self->rx_buff.head = 208 208 dma_zalloc_coherent(NULL, self->rx_buff.truesize, ··· 238 238 239 239 /* Need to store self somewhere */ 240 240 dev_self[i] = self; 241 - 241 + 242 242 return 0; 243 243 err_out3: 244 244 dma_free_coherent(NULL, self->tx_buff.truesize, 245 245 self->tx_buff.head, self->tx_buff_dma); 246 - err_out2: 246 + err_out2: 247 247 dma_free_coherent(NULL, self->rx_buff.truesize, 248 248 self->rx_buff.head, self->rx_buff_dma); 249 249 err_out1: ··· 288 288 if (self->tx_buff.head) 289 289 dma_free_coherent(NULL, self->tx_buff.truesize, 290 290 self->tx_buff.head, self->tx_buff_dma); 291 - 291 + 292 292 if (self->rx_buff.head) 293 293 dma_free_coherent(NULL, self->rx_buff.truesize, 294 294 self->rx_buff.head, self->rx_buff_dma); ··· 300 300 301 301 static int w83977af_probe(int iobase, int irq, int dma) 302 302 { 303 - int version; 303 + int version; 304 304 int i; 305 - 306 - for (i=0; i < 2; i++) { 305 + 306 + for (i=0; i < 2; i++) { 307 307 #ifdef CONFIG_USE_W977_PNP 308 - /* Enter PnP configuration mode */ 308 + /* Enter PnP configuration mode */ 309 309 w977_efm_enter(efbase[i]); 310 - 311 - w977_select_device(W977_DEVICE_IR, efbase[i]); 312 - 313 - /* Configure PnP port, IRQ, and DMA channel */ 314 - w977_write_reg(0x60, (iobase >> 8) & 0xff, efbase[i]); 315 - w977_write_reg(0x61, (iobase) & 0xff, efbase[i]); 316 - 317 - w977_write_reg(0x70, irq, efbase[i]); 310 + 311 + w977_select_device(W977_DEVICE_IR, efbase[i]); 312 + 313 + /* Configure PnP port, IRQ, and DMA channel */ 314 + w977_write_reg(0x60, (iobase >> 8) & 0xff, efbase[i]); 315 + w977_write_reg(0x61, (iobase) & 0xff, efbase[i]); 316 + 317 + w977_write_reg(0x70, irq, efbase[i]); 318 318 #ifdef CONFIG_ARCH_NETWINDER 319 319 /* Netwinder uses 1 higher than Linux */ 320 - w977_write_reg(0x74, dma+1, efbase[i]); 320 + w977_write_reg(0x74, dma+1, efbase[i]); 321 321 #else 322 - w977_write_reg(0x74, dma, efbase[i]); 322 + w977_write_reg(0x74, dma, efbase[i]); 323 323 #endif /* CONFIG_ARCH_NETWINDER */ 324 - w977_write_reg(0x75, 0x04, efbase[i]); /* Disable Tx DMA */ 325 - 326 - /* Set append hardware CRC, enable IR bank selection */ 327 - w977_write_reg(0xf0, APEDCRC|ENBNKSEL, efbase[i]); 328 - 329 - /* Activate device */ 330 - w977_write_reg(0x30, 0x01, efbase[i]); 331 - 332 - w977_efm_exit(efbase[i]); 324 + w977_write_reg(0x75, 0x04, efbase[i]);/* Disable Tx DMA */ 325 + 326 + /* Set append hardware CRC, enable IR bank selection */ 327 + w977_write_reg(0xf0, APEDCRC | ENBNKSEL, efbase[i]); 328 + 329 + /* Activate device */ 330 + w977_write_reg(0x30, 0x01, efbase[i]); 331 + 332 + w977_efm_exit(efbase[i]); 333 333 #endif /* CONFIG_USE_W977_PNP */ 334 - /* Disable Advanced mode */ 335 - switch_bank(iobase, SET2); 336 - outb(iobase+2, 0x00); 337 - 338 - /* Turn on UART (global) interrupts */ 339 - switch_bank(iobase, SET0); 340 - outb(HCR_EN_IRQ, iobase+HCR); 341 - 342 - /* Switch to advanced mode */ 343 - switch_bank(iobase, SET2); 344 - outb(inb(iobase+ADCR1) | ADCR1_ADV_SL, iobase+ADCR1); 345 - 346 - /* Set default IR-mode */ 347 - switch_bank(iobase, SET0); 348 - outb(HCR_SIR, iobase+HCR); 349 - 350 - /* Read the Advanced IR ID */ 351 - switch_bank(iobase, SET3); 352 - version = inb(iobase+AUID); 353 - 354 - /* Should be 0x1? */ 355 - if (0x10 == (version & 0xf0)) { 356 - efio = efbase[i]; 357 - 358 - /* Set FIFO size to 32 */ 359 - switch_bank(iobase, SET2); 360 - outb(ADCR2_RXFS32|ADCR2_TXFS32, iobase+ADCR2); 361 - 362 - /* Set FIFO threshold to TX17, RX16 */ 363 - switch_bank(iobase, SET0); 364 - outb(UFR_RXTL|UFR_TXTL|UFR_TXF_RST|UFR_RXF_RST| 334 + /* Disable Advanced mode */ 335 + switch_bank(iobase, SET2); 336 + outb(iobase+2, 0x00); 337 + 338 + /* Turn on UART (global) interrupts */ 339 + switch_bank(iobase, SET0); 340 + outb(HCR_EN_IRQ, iobase+HCR); 341 + 342 + /* Switch to advanced mode */ 343 + switch_bank(iobase, SET2); 344 + outb(inb(iobase+ADCR1) | ADCR1_ADV_SL, iobase+ADCR1); 345 + 346 + /* Set default IR-mode */ 347 + switch_bank(iobase, SET0); 348 + outb(HCR_SIR, iobase+HCR); 349 + 350 + /* Read the Advanced IR ID */ 351 + switch_bank(iobase, SET3); 352 + version = inb(iobase+AUID); 353 + 354 + /* Should be 0x1? */ 355 + if (0x10 == (version & 0xf0)) { 356 + efio = efbase[i]; 357 + 358 + /* Set FIFO size to 32 */ 359 + switch_bank(iobase, SET2); 360 + outb(ADCR2_RXFS32|ADCR2_TXFS32, iobase+ADCR2); 361 + 362 + /* Set FIFO threshold to TX17, RX16 */ 363 + switch_bank(iobase, SET0); 364 + outb(UFR_RXTL|UFR_TXTL|UFR_TXF_RST|UFR_RXF_RST| 365 365 UFR_EN_FIFO,iobase+UFR); 366 - 367 - /* Receiver frame length */ 368 - switch_bank(iobase, SET4); 366 + 367 + /* Receiver frame length */ 368 + switch_bank(iobase, SET4); 369 369 outb(2048 & 0xff, iobase+6); 370 370 outb((2048 >> 8) & 0x1f, iobase+7); 371 371 372 - /* 373 - * Init HP HSDL-1100 transceiver. 374 - * 375 - * Set IRX_MSL since we have 2 * receive paths IRRX, 376 - * and IRRXH. Clear IRSL0D since we want IRSL0 * to 377 - * be a input pin used for IRRXH 372 + /* 373 + * Init HP HSDL-1100 transceiver. 378 374 * 379 - * IRRX pin 37 connected to receiver 375 + * Set IRX_MSL since we have 2 * receive paths IRRX, 376 + * and IRRXH. Clear IRSL0D since we want IRSL0 * to 377 + * be a input pin used for IRRXH 378 + * 379 + * IRRX pin 37 connected to receiver 380 380 * IRTX pin 38 connected to transmitter 381 - * FIRRX pin 39 connected to receiver (IRSL0) 381 + * FIRRX pin 39 connected to receiver (IRSL0) 382 382 * CIRRX pin 40 connected to pin 37 383 383 */ 384 384 switch_bank(iobase, SET7); 385 385 outb(0x40, iobase+7); 386 - 386 + 387 387 net_info_ratelimited("W83977AF (IR) driver loaded. Version: 0x%02x\n", 388 388 version); 389 - 389 + 390 390 return 0; 391 391 } else { 392 392 /* Try next extented function register address */ 393 393 pr_debug("%s(), Wrong chip version", __func__); 394 394 } 395 - } 395 + } 396 396 return -1; 397 397 } 398 398 399 399 static void w83977af_change_speed(struct w83977af_ir *self, __u32 speed) 400 400 { 401 401 int ir_mode = HCR_SIR; 402 - int iobase; 402 + int iobase; 403 403 __u8 set; 404 404 405 405 iobase = self->io.fir_base; ··· 448 448 449 449 /* set FIFO size to 32 */ 450 450 switch_bank(iobase, SET2); 451 - outb(ADCR2_RXFS32|ADCR2_TXFS32, iobase+ADCR2); 452 - 451 + outb(ADCR2_RXFS32|ADCR2_TXFS32, iobase+ADCR2); 452 + 453 453 /* set FIFO threshold to TX17, RX16 */ 454 454 switch_bank(iobase, SET0); 455 455 outb(0x00, iobase+UFR); /* Reset */ ··· 457 457 outb(0xa7, iobase+UFR); 458 458 459 459 netif_wake_queue(self->netdev); 460 - 460 + 461 461 /* Enable some interrupts so we can receive frames */ 462 462 switch_bank(iobase, SET0); 463 463 if (speed > PIO_MAX_SPEED) { ··· 465 465 w83977af_dma_receive(self); 466 466 } else 467 467 outb(ICR_ERBRI, iobase+ICR); 468 - 468 + 469 469 /* Restore SSR */ 470 470 outb(set, iobase+SSR); 471 471 } ··· 484 484 int iobase; 485 485 __u8 set; 486 486 int mtt; 487 - 487 + 488 488 self = netdev_priv(dev); 489 489 490 490 iobase = self->io.fir_base; 491 491 492 492 pr_debug("%s(%ld), skb->len=%d\n", __func__ , jiffies, 493 493 (int)skb->len); 494 - 494 + 495 495 /* Lock transmit buffer */ 496 496 netif_stop_queue(dev); 497 - 497 + 498 498 /* Check if we need to change the speed */ 499 499 speed = irda_get_next_speed(skb); 500 500 if ((speed != self->io.speed) && (speed != -1)) { 501 501 /* Check for empty frame */ 502 502 if (!skb->len) { 503 - w83977af_change_speed(self, speed); 503 + w83977af_change_speed(self, speed); 504 504 dev_kfree_skb(skb); 505 505 return NETDEV_TX_OK; 506 506 } else ··· 509 509 510 510 /* Save current set */ 511 511 set = inb(iobase+SSR); 512 - 512 + 513 513 /* Decide if we should use PIO or DMA transfer */ 514 514 if (self->io.speed > PIO_MAX_SPEED) { 515 515 self->tx_buff.data = self->tx_buff.head; 516 516 skb_copy_from_linear_data(skb, self->tx_buff.data, skb->len); 517 517 self->tx_buff.len = skb->len; 518 - 518 + 519 519 mtt = irda_get_mtt(skb); 520 520 pr_debug("%s(%ld), mtt=%d\n", __func__ , jiffies, mtt); 521 - if (mtt > 1000) 522 - mdelay(mtt/1000); 523 - else if (mtt) 524 - udelay(mtt); 521 + if (mtt > 1000) 522 + mdelay(mtt/1000); 523 + else if (mtt) 524 + udelay(mtt); 525 525 526 - /* Enable DMA interrupt */ 527 - switch_bank(iobase, SET0); 528 - outb(ICR_EDMAI, iobase+ICR); 529 - w83977af_dma_write(self, iobase); 526 + /* Enable DMA interrupt */ 527 + switch_bank(iobase, SET0); 528 + outb(ICR_EDMAI, iobase+ICR); 529 + w83977af_dma_write(self, iobase); 530 530 } else { 531 531 self->tx_buff.data = self->tx_buff.head; 532 - self->tx_buff.len = async_wrap_skb(skb, self->tx_buff.data, 532 + self->tx_buff.len = async_wrap_skb(skb, self->tx_buff.data, 533 533 self->tx_buff.truesize); 534 - 534 + 535 535 /* Add interrupt on tx low level (will fire immediately) */ 536 536 switch_bank(iobase, SET0); 537 537 outb(ICR_ETXTHI, iobase+ICR); ··· 562 562 switch_bank(iobase, SET0); 563 563 outb(inb(iobase+HCR) & ~HCR_EN_DMA, iobase+HCR); 564 564 565 - /* Choose transmit DMA channel */ 565 + /* Choose transmit DMA channel */ 566 566 switch_bank(iobase, SET2); 567 567 outb(ADCR1_D_CHSW|/*ADCR1_DMA_F|*/ADCR1_ADV_SL, iobase+ADCR1); 568 568 irda_setup_dma(self->io.dma, self->tx_buff_dma, self->tx_buff.len, 569 - DMA_MODE_WRITE); 569 + DMA_MODE_WRITE); 570 570 self->io.direction = IO_XMIT; 571 - 571 + 572 572 /* Enable DMA */ 573 - switch_bank(iobase, SET0); 573 + switch_bank(iobase, SET0); 574 574 outb(inb(iobase+HCR) | HCR_EN_DMA | HCR_TX_WT, iobase+HCR); 575 575 576 576 /* Restore set register */ ··· 580 580 /* 581 581 * Function w83977af_pio_write (iobase, buf, len, fifo_size) 582 582 * 583 - * 583 + * 584 584 * 585 585 */ 586 586 static int w83977af_pio_write(int iobase, __u8 *buf, int len, int fifo_size) 587 587 { 588 588 int actual = 0; 589 589 __u8 set; 590 - 590 + 591 591 /* Save current bank */ 592 592 set = inb(iobase+SSR); 593 593 ··· 605 605 /* Transmit next byte */ 606 606 outb(buf[actual++], iobase+TBR); 607 607 } 608 - 608 + 609 609 pr_debug("%s(), fifo_size %d ; %d sent of %d\n", 610 610 __func__ , fifo_size, actual, len); 611 611 ··· 620 620 * 621 621 * The transfer of a frame in finished. So do the necessary things 622 622 * 623 - * 623 + * 624 624 */ 625 625 static void w83977af_dma_xmit_complete(struct w83977af_ir *self) 626 626 { ··· 639 639 /* Disable DMA */ 640 640 switch_bank(iobase, SET0); 641 641 outb(inb(iobase+HCR) & ~HCR_EN_DMA, iobase+HCR); 642 - 642 + 643 643 /* Check for underrun! */ 644 644 if (inb(iobase+AUDR) & AUDR_UNDR) { 645 645 pr_debug("%s(), Transmit underrun!\n", __func__); 646 - 646 + 647 647 self->netdev->stats.tx_errors++; 648 648 self->netdev->stats.tx_fifo_errors++; 649 649 ··· 652 652 } else 653 653 self->netdev->stats.tx_packets++; 654 654 655 - 655 + 656 656 if (self->new_speed) { 657 657 w83977af_change_speed(self, self->new_speed); 658 658 self->new_speed = 0; ··· 661 661 /* Unlock tx_buff and request another frame */ 662 662 /* Tell the network layer, that we want more frames */ 663 663 netif_wake_queue(self->netdev); 664 - 664 + 665 665 /* Restore set */ 666 666 outb(set, iobase+SSR); 667 667 } ··· 714 714 irda_setup_dma(self->io.dma, self->rx_buff_dma, self->rx_buff.truesize, 715 715 DMA_MODE_READ); 716 716 #endif 717 - /* 718 - * Reset Rx FIFO. This will also flush the ST_FIFO, it's very 717 + /* 718 + * Reset Rx FIFO. This will also flush the ST_FIFO, it's very 719 719 * important that we don't reset the Tx FIFO since it might not 720 720 * be finished transmitting yet 721 721 */ 722 722 switch_bank(iobase, SET0); 723 723 outb(UFR_RXTL|UFR_TXTL|UFR_RXF_RST|UFR_EN_FIFO, iobase+UFR); 724 724 self->st_fifo.len = self->st_fifo.tail = self->st_fifo.head = 0; 725 - 725 + 726 726 /* Enable DMA */ 727 727 switch_bank(iobase, SET0); 728 728 #ifdef CONFIG_ARCH_NETWINDER ··· 730 730 outb(hcr | HCR_EN_DMA, iobase+HCR); 731 731 enable_dma(self->io.dma); 732 732 spin_unlock_irqrestore(&self->lock, flags); 733 - #else 733 + #else 734 734 outb(inb(iobase+HCR) | HCR_EN_DMA, iobase+HCR); 735 735 #endif 736 736 /* Restore set */ ··· 762 762 763 763 /* Save current set */ 764 764 set = inb(iobase+SSR); 765 - 765 + 766 766 iobase = self->io.fir_base; 767 767 768 768 /* Read status FIFO */ 769 769 switch_bank(iobase, SET5); 770 770 while ((status = inb(iobase+FS_FO)) & FS_FO_FSFDR) { 771 771 st_fifo->entries[st_fifo->tail].status = status; 772 - 772 + 773 773 st_fifo->entries[st_fifo->tail].len = inb(iobase+RFLFL); 774 774 st_fifo->entries[st_fifo->tail].len |= inb(iobase+RFLFH) << 8; 775 - 775 + 776 776 st_fifo->tail++; 777 777 st_fifo->len++; 778 778 } 779 - 779 + 780 780 while (st_fifo->len) { 781 781 /* Get first entry */ 782 782 status = st_fifo->entries[st_fifo->head].status; ··· 792 792 } else { 793 793 /* Skip frame */ 794 794 self->netdev->stats.rx_errors++; 795 - 795 + 796 796 self->rx_buff.data += len; 797 - 797 + 798 798 if (status & FS_FO_MX_LEX) 799 799 self->netdev->stats.rx_length_errors++; 800 - 801 - if (status & FS_FO_PHY_ERR) 800 + 801 + if (status & FS_FO_PHY_ERR) 802 802 self->netdev->stats.rx_frame_errors++; 803 - 804 - if (status & FS_FO_CRC_ERR) 803 + 804 + if (status & FS_FO_CRC_ERR) 805 805 self->netdev->stats.rx_crc_errors++; 806 806 } 807 807 /* The errors below can be reported in both cases */ 808 808 if (status & FS_FO_RX_OV) 809 809 self->netdev->stats.rx_fifo_errors++; 810 - 810 + 811 811 if (status & FS_FO_FSF_OV) 812 812 self->netdev->stats.rx_fifo_errors++; 813 - 813 + 814 814 } else { 815 815 /* Check if we have transferred all data to memory */ 816 816 switch_bank(iobase, SET0); 817 817 if (inb(iobase+USR) & USR_RDR) { 818 818 udelay(80); /* Should be enough!? */ 819 819 } 820 - 820 + 821 821 skb = dev_alloc_skb(len+1); 822 822 if (skb == NULL) { 823 823 printk(KERN_INFO ··· 827 827 828 828 return FALSE; 829 829 } 830 - 830 + 831 831 /* Align to 20 bytes */ 832 - skb_reserve(skb, 1); 833 - 832 + skb_reserve(skb, 1); 833 + 834 834 /* Copy frame without CRC */ 835 835 if (self->io.speed < 4000000) { 836 836 skb_put(skb, len-2); ··· 847 847 /* Move to next frame */ 848 848 self->rx_buff.data += len; 849 849 self->netdev->stats.rx_packets++; 850 - 850 + 851 851 skb->dev = self->netdev; 852 852 skb_reset_mac_header(skb); 853 853 skb->protocol = htons(ETH_P_IRDA); ··· 866 866 * Receive all data in receiver FIFO 867 867 * 868 868 */ 869 - static void w83977af_pio_receive(struct w83977af_ir *self) 869 + static void w83977af_pio_receive(struct w83977af_ir *self) 870 870 { 871 871 __u8 byte = 0x00; 872 872 int iobase; 873 873 874 874 IRDA_ASSERT(self != NULL, return;); 875 - 875 + 876 876 iobase = self->io.fir_base; 877 - 877 + 878 878 /* Receive all characters in Rx FIFO */ 879 879 do { 880 880 byte = inb(iobase+RBR); 881 881 async_unwrap_char(self->netdev, &self->netdev->stats, &self->rx_buff, 882 882 byte); 883 - } while (inb(iobase+USR) & USR_RDR); /* Data available */ 883 + } while (inb(iobase+USR) & USR_RDR); /* Data available */ 884 884 } 885 885 886 886 /* ··· 897 897 int iobase; 898 898 899 899 pr_debug("%s(), isr=%#x\n", __func__ , isr); 900 - 900 + 901 901 iobase = self->io.fir_base; 902 902 /* Transmit FIFO low on data */ 903 903 if (isr & ISR_TXTH_I) { 904 904 /* Write data left in transmit buffer */ 905 - actual = w83977af_pio_write(self->io.fir_base, 906 - self->tx_buff.data, 907 - self->tx_buff.len, 905 + actual = w83977af_pio_write(self->io.fir_base, 906 + self->tx_buff.data, 907 + self->tx_buff.len, 908 908 self->io.fifo_size); 909 909 910 910 self->tx_buff.data += actual; 911 911 self->tx_buff.len -= actual; 912 - 912 + 913 913 self->io.direction = IO_XMIT; 914 914 915 915 /* Check if finished */ ··· 919 919 set = inb(iobase+SSR); 920 920 switch_bank(iobase, SET0); 921 921 outb(AUDR_SFEND, iobase+AUDR); 922 - outb(set, iobase+SSR); 922 + outb(set, iobase+SSR); 923 923 924 924 self->netdev->stats.tx_packets++; 925 925 ··· 929 929 } 930 930 } 931 931 /* Check if transmission has completed */ 932 - if (isr & ISR_TXEMP_I) { 932 + if (isr & ISR_TXEMP_I) { 933 933 /* Check if we need to change the speed? */ 934 934 if (self->new_speed) { 935 935 pr_debug("%s(), Changing speed!\n", __func__); ··· 966 966 967 967 iobase = self->io.fir_base; 968 968 set = inb(iobase+SSR); 969 - 969 + 970 970 /* End of frame detected in FIFO */ 971 971 if (isr & (ISR_FEND_I|ISR_FSF_I)) { 972 972 if (w83977af_dma_receive_complete(self)) { 973 - 973 + 974 974 /* Wait for next status FIFO interrupt */ 975 975 new_icr |= ICR_EFSFI; 976 976 } else { ··· 995 995 996 996 /* Clear timer event */ 997 997 /* switch_bank(iobase, SET0); */ 998 - /* outb(ASCR_CTE, iobase+ASCR); */ 998 + /* outb(ASCR_CTE, iobase+ASCR); */ 999 999 1000 1000 /* Check if this is a TX timer interrupt */ 1001 1001 if (self->io.direction == IO_XMIT) { ··· 1008 1008 1009 1009 new_icr |= ICR_EFSFI; 1010 1010 } 1011 - } 1011 + } 1012 1012 /* Finished with DMA */ 1013 1013 if (isr & ISR_DMA_I) { 1014 1014 w83977af_dma_xmit_complete(self); 1015 1015 1016 1016 /* Check if there are more frames to be transmitted */ 1017 1017 /* if (irda_device_txqueue_empty(self)) { */ 1018 - 1019 - /* Prepare for receive 1020 - * 1018 + 1019 + /* Prepare for receive 1020 + * 1021 1021 * ** Netwinder Tx DMA likes that we do this anyway ** 1022 1022 */ 1023 1023 w83977af_dma_receive(self); 1024 1024 new_icr = ICR_EFSFI; 1025 - /* } */ 1025 + /* } */ 1026 1026 } 1027 - 1027 + 1028 1028 /* Restore set */ 1029 1029 outb(set, iobase+SSR); 1030 1030 ··· 1051 1051 /* Save current bank */ 1052 1052 set = inb(iobase+SSR); 1053 1053 switch_bank(iobase, SET0); 1054 - 1055 - icr = inb(iobase+ICR); 1056 - isr = inb(iobase+ISR) & icr; /* Mask out the interesting ones */ 1054 + 1055 + icr = inb(iobase+ICR); 1056 + isr = inb(iobase+ISR) & icr; /* Mask out the interesting ones */ 1057 1057 1058 1058 outb(0, iobase+ICR); /* Disable interrupts */ 1059 - 1059 + 1060 1060 if (isr) { 1061 1061 /* Dispatch interrupt handler for the current speed */ 1062 1062 if (self->io.speed > PIO_MAX_SPEED ) ··· 1095 1095 status = TRUE; 1096 1096 } 1097 1097 outb(set, iobase+SSR); 1098 - } else 1098 + } else 1099 1099 status = (self->rx_buff.state != OUTSIDE_FRAME); 1100 - 1100 + 1101 1101 return status; 1102 1102 } 1103 1103 ··· 1113 1113 int iobase; 1114 1114 char hwname[32]; 1115 1115 __u8 set; 1116 - 1117 - 1116 + 1117 + 1118 1118 IRDA_ASSERT(dev != NULL, return -1;); 1119 1119 self = netdev_priv(dev); 1120 - 1120 + 1121 1121 IRDA_ASSERT(self != NULL, return 0;); 1122 - 1122 + 1123 1123 iobase = self->io.fir_base; 1124 1124 1125 - if (request_irq(self->io.irq, w83977af_interrupt, 0, dev->name, 1125 + if (request_irq(self->io.irq, w83977af_interrupt, 0, dev->name, 1126 1126 (void *) dev)) { 1127 1127 return -EAGAIN; 1128 1128 } ··· 1134 1134 free_irq(self->io.irq, dev); 1135 1135 return -EAGAIN; 1136 1136 } 1137 - 1137 + 1138 1138 /* Save current set */ 1139 1139 set = inb(iobase+SSR); 1140 1140 1141 - /* Enable some interrupts so we can receive frames again */ 1142 - switch_bank(iobase, SET0); 1143 - if (self->io.speed > 115200) { 1144 - outb(ICR_EFSFI, iobase+ICR); 1145 - w83977af_dma_receive(self); 1146 - } else 1147 - outb(ICR_ERBRI, iobase+ICR); 1141 + /* Enable some interrupts so we can receive frames again */ 1142 + switch_bank(iobase, SET0); 1143 + if (self->io.speed > 115200) { 1144 + outb(ICR_EFSFI, iobase+ICR); 1145 + w83977af_dma_receive(self); 1146 + } else 1147 + outb(ICR_ERBRI, iobase+ICR); 1148 1148 1149 1149 /* Restore bank register */ 1150 1150 outb(set, iobase+SSR); 1151 1151 1152 1152 /* Ready to play! */ 1153 1153 netif_start_queue(dev); 1154 - 1154 + 1155 1155 /* Give self a hardware name */ 1156 1156 sprintf(hwname, "w83977af @ 0x%03x", self->io.fir_base); 1157 1157 1158 - /* 1158 + /* 1159 1159 * Open new IrLAP layer instance, now that everything should be 1160 - * initialized properly 1160 + * initialized properly 1161 1161 */ 1162 1162 self->irlap = irlap_open(dev, &self->qos, hwname); 1163 1163 ··· 1177 1177 __u8 set; 1178 1178 1179 1179 IRDA_ASSERT(dev != NULL, return -1;); 1180 - 1180 + 1181 1181 self = netdev_priv(dev); 1182 - 1182 + 1183 1183 IRDA_ASSERT(self != NULL, return 0;); 1184 - 1184 + 1185 1185 iobase = self->io.fir_base; 1186 1186 1187 1187 /* Stop device */ 1188 1188 netif_stop_queue(dev); 1189 - 1189 + 1190 1190 /* Stop and remove instance of IrLAP */ 1191 1191 if (self->irlap) 1192 1192 irlap_close(self->irlap); ··· 1196 1196 1197 1197 /* Save current set */ 1198 1198 set = inb(iobase+SSR); 1199 - 1199 + 1200 1200 /* Disable interrupts */ 1201 1201 switch_bank(iobase, SET0); 1202 - outb(0, iobase+ICR); 1202 + outb(0, iobase+ICR); 1203 1203 1204 1204 free_irq(self->io.irq, dev); 1205 1205 free_dma(self->io.dma); ··· 1230 1230 IRDA_ASSERT(self != NULL, return -1;); 1231 1231 1232 1232 pr_debug("%s(), %s, (cmd=0x%X)\n", __func__ , dev->name, cmd); 1233 - 1233 + 1234 1234 spin_lock_irqsave(&self->lock, flags); 1235 1235 1236 1236 switch (cmd) { ··· 1274 1274 /* 1275 1275 * Function init_module (void) 1276 1276 * 1277 - * 1277 + * 1278 1278 * 1279 1279 */ 1280 1280 module_init(w83977af_init); ··· 1282 1282 /* 1283 1283 * Function cleanup_module (void) 1284 1284 * 1285 - * 1285 + * 1286 1286 * 1287 1287 */ 1288 1288 module_exit(w83977af_cleanup);