diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-09-27 07:41:50 -0400 |
---|---|---|
committer | Jens Axboe <axboe@carl.home.kernel.dk> | 2007-10-10 03:25:59 -0400 |
commit | 4e953a216265f8646360fa909bdc87ea4bf446b3 (patch) | |
tree | 7ee287e00404496b221f69664dad6d2169c3fdf1 /drivers/block/umem.c | |
parent | ee4a7b6874469244ed0e3b8fde20028e0bb52642 (diff) |
drivers/block/umem: trim trailing whitespace
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/block/umem.c')
-rw-r--r-- | drivers/block/umem.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/block/umem.c b/drivers/block/umem.c index 97c5dc9436a9..251041763690 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c | |||
@@ -293,7 +293,7 @@ static void mm_start_io(struct cardinfo *card) | |||
293 | desc->control_bits &= ~cpu_to_le32(DMASCR_CHAIN_EN); | 293 | desc->control_bits &= ~cpu_to_le32(DMASCR_CHAIN_EN); |
294 | desc->sem_control_bits = desc->control_bits; | 294 | desc->sem_control_bits = desc->control_bits; |
295 | 295 | ||
296 | 296 | ||
297 | if (debug & DEBUG_LED_ON_TRANSFER) | 297 | if (debug & DEBUG_LED_ON_TRANSFER) |
298 | set_led(card, LED_REMOVE, LED_ON); | 298 | set_led(card, LED_REMOVE, LED_ON); |
299 | 299 | ||
@@ -327,7 +327,7 @@ static int add_bio(struct cardinfo *card); | |||
327 | 327 | ||
328 | static void activate(struct cardinfo *card) | 328 | static void activate(struct cardinfo *card) |
329 | { | 329 | { |
330 | /* if No page is Active, and Ready is | 330 | /* if No page is Active, and Ready is |
331 | * not empty, then switch Ready page | 331 | * not empty, then switch Ready page |
332 | * to active and start IO. | 332 | * to active and start IO. |
333 | * Then add any bh's that are available to Ready | 333 | * Then add any bh's that are available to Ready |
@@ -366,7 +366,7 @@ static void mm_unplug_device(struct request_queue *q) | |||
366 | spin_unlock_irqrestore(&card->lock, flags); | 366 | spin_unlock_irqrestore(&card->lock, flags); |
367 | } | 367 | } |
368 | 368 | ||
369 | /* | 369 | /* |
370 | * If there is room on Ready page, take | 370 | * If there is room on Ready page, take |
371 | * one bh off list and add it. | 371 | * one bh off list and add it. |
372 | * return 1 if there was room, else 0. | 372 | * return 1 if there was room, else 0. |
@@ -467,7 +467,7 @@ static void process_page(unsigned long data) | |||
467 | if (card->Active < 0) | 467 | if (card->Active < 0) |
468 | goto out_unlock; | 468 | goto out_unlock; |
469 | page = &card->mm_pages[card->Active]; | 469 | page = &card->mm_pages[card->Active]; |
470 | 470 | ||
471 | while (page->headcnt < page->cnt) { | 471 | while (page->headcnt < page->cnt) { |
472 | struct bio *bio = page->bio; | 472 | struct bio *bio = page->bio; |
473 | struct mm_dma_desc *desc = &page->desc[page->headcnt]; | 473 | struct mm_dma_desc *desc = &page->desc[page->headcnt]; |
@@ -477,7 +477,7 @@ static void process_page(unsigned long data) | |||
477 | 477 | ||
478 | if (!(control & DMASCR_DMA_COMPLETE)) { | 478 | if (!(control & DMASCR_DMA_COMPLETE)) { |
479 | control = dma_status; | 479 | control = dma_status; |
480 | last=1; | 480 | last=1; |
481 | } | 481 | } |
482 | page->headcnt++; | 482 | page->headcnt++; |
483 | idx = page->idx; | 483 | idx = page->idx; |
@@ -487,7 +487,7 @@ static void process_page(unsigned long data) | |||
487 | page->idx = page->bio->bi_idx; | 487 | page->idx = page->bio->bi_idx; |
488 | } | 488 | } |
489 | 489 | ||
490 | pci_unmap_page(card->dev, desc->data_dma_handle, | 490 | pci_unmap_page(card->dev, desc->data_dma_handle, |
491 | bio_iovec_idx(bio,idx)->bv_len, | 491 | bio_iovec_idx(bio,idx)->bv_len, |
492 | (control& DMASCR_TRANSFER_READ) ? | 492 | (control& DMASCR_TRANSFER_READ) ? |
493 | PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE); | 493 | PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE); |
@@ -592,7 +592,7 @@ HW_TRACE(0x30); | |||
592 | else | 592 | else |
593 | writeb((DMASCR_DMA_COMPLETE|DMASCR_CHAIN_COMPLETE) >> 16, | 593 | writeb((DMASCR_DMA_COMPLETE|DMASCR_CHAIN_COMPLETE) >> 16, |
594 | card->csr_remap+ DMA_STATUS_CTRL + 2); | 594 | card->csr_remap+ DMA_STATUS_CTRL + 2); |
595 | 595 | ||
596 | /* log errors and clear interrupt status */ | 596 | /* log errors and clear interrupt status */ |
597 | if (dma_status & DMASCR_ANY_ERR) { | 597 | if (dma_status & DMASCR_ANY_ERR) { |
598 | unsigned int data_log1, data_log2; | 598 | unsigned int data_log1, data_log2; |
@@ -668,7 +668,7 @@ HW_TRACE(0x30); | |||
668 | 668 | ||
669 | HW_TRACE(0x36); | 669 | HW_TRACE(0x36); |
670 | 670 | ||
671 | return IRQ_HANDLED; | 671 | return IRQ_HANDLED; |
672 | } | 672 | } |
673 | /* | 673 | /* |
674 | ----------------------------------------------------------------------------------- | 674 | ----------------------------------------------------------------------------------- |
@@ -761,7 +761,7 @@ static void check_all_batteries(unsigned long ptr) | |||
761 | { | 761 | { |
762 | int i; | 762 | int i; |
763 | 763 | ||
764 | for (i = 0; i < num_cards; i++) | 764 | for (i = 0; i < num_cards; i++) |
765 | if (!(cards[i].flags & UM_FLAG_NO_BATT)) { | 765 | if (!(cards[i].flags & UM_FLAG_NO_BATT)) { |
766 | struct cardinfo *card = &cards[i]; | 766 | struct cardinfo *card = &cards[i]; |
767 | spin_lock_bh(&card->lock); | 767 | spin_lock_bh(&card->lock); |
@@ -972,7 +972,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i | |||
972 | tasklet_init(&card->tasklet, process_page, (unsigned long)card); | 972 | tasklet_init(&card->tasklet, process_page, (unsigned long)card); |
973 | 973 | ||
974 | card->check_batteries = 0; | 974 | card->check_batteries = 0; |
975 | 975 | ||
976 | mem_present = readb(card->csr_remap + MEMCTRLSTATUS_MEMORY); | 976 | mem_present = readb(card->csr_remap + MEMCTRLSTATUS_MEMORY); |
977 | switch (mem_present) { | 977 | switch (mem_present) { |
978 | case MEM_128_MB: | 978 | case MEM_128_MB: |
@@ -1005,7 +1005,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i | |||
1005 | card->battery[1].good = !(batt_status & BATTERY_2_FAILURE); | 1005 | card->battery[1].good = !(batt_status & BATTERY_2_FAILURE); |
1006 | card->battery[0].last_change = card->battery[1].last_change = jiffies; | 1006 | card->battery[0].last_change = card->battery[1].last_change = jiffies; |
1007 | 1007 | ||
1008 | if (card->flags & UM_FLAG_NO_BATT) | 1008 | if (card->flags & UM_FLAG_NO_BATT) |
1009 | dev_printk(KERN_INFO, &card->dev->dev, | 1009 | dev_printk(KERN_INFO, &card->dev->dev, |
1010 | "Size %d KB\n", card->mm_size); | 1010 | "Size %d KB\n", card->mm_size); |
1011 | else { | 1011 | else { |