iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers/block/umem: trim trailing whitespace

Browse Source 
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Jeff Garzik 2007-09-27 07:41:50 -04:00 committed by Jens Axboe
parent ee4a7b6874
commit 4e953a2162
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/block/umem.c
View File

@ -293,7 +293,7 @@ static void mm_start_io(struct cardinfo *card)
desc->control_bits &= ~cpu_to_le32(DMASCR_CHAIN_EN); desc->control_bits &= ~cpu_to_le32(DMASCR_CHAIN_EN);
desc->sem_control_bits = desc->control_bits; desc->sem_control_bits = desc->control_bits;
if (debug & DEBUG_LED_ON_TRANSFER) if (debug & DEBUG_LED_ON_TRANSFER)
set_led(card, LED_REMOVE, LED_ON); set_led(card, LED_REMOVE, LED_ON);
@ -327,7 +327,7 @@ static int add_bio(struct cardinfo *card);
static void activate(struct cardinfo *card) static void activate(struct cardinfo *card)
{ {
/* if No page is Active, and Ready is /* if No page is Active, and Ready is
* not empty, then switch Ready page * not empty, then switch Ready page
* to active and start IO. * to active and start IO.
* Then add any bh's that are available to Ready * Then add any bh's that are available to Ready
@ -366,7 +366,7 @@ static void mm_unplug_device(struct request_queue *q)
spin_unlock_irqrestore(&card->lock, flags); spin_unlock_irqrestore(&card->lock, flags);
} }
/* /*
* If there is room on Ready page, take * If there is room on Ready page, take
* one bh off list and add it. * one bh off list and add it.
* return 1 if there was room, else 0. * return 1 if there was room, else 0.
@ -467,7 +467,7 @@ static void process_page(unsigned long data)
if (card->Active < 0) if (card->Active < 0)
goto out_unlock; goto out_unlock;
page = &card->mm_pages[card->Active]; page = &card->mm_pages[card->Active];
while (page->headcnt < page->cnt) { while (page->headcnt < page->cnt) {
struct bio *bio = page->bio; struct bio *bio = page->bio;
struct mm_dma_desc *desc = &page->desc[page->headcnt]; struct mm_dma_desc *desc = &page->desc[page->headcnt];
@ -477,7 +477,7 @@ static void process_page(unsigned long data)
if (!(control & DMASCR_DMA_COMPLETE)) { if (!(control & DMASCR_DMA_COMPLETE)) {
control = dma_status; control = dma_status;
last=1; last=1;
} }
page->headcnt++; page->headcnt++;
idx = page->idx; idx = page->idx;
@ -487,7 +487,7 @@ static void process_page(unsigned long data)
page->idx = page->bio->bi_idx; page->idx = page->bio->bi_idx;
} }
pci_unmap_page(card->dev, desc->data_dma_handle, pci_unmap_page(card->dev, desc->data_dma_handle,
bio_iovec_idx(bio,idx)->bv_len, bio_iovec_idx(bio,idx)->bv_len,
(control& DMASCR_TRANSFER_READ) ? (control& DMASCR_TRANSFER_READ) ?
PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE); PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE);
@ -592,7 +592,7 @@ HW_TRACE(0x30);
else else
writeb((DMASCR_DMA_COMPLETE|DMASCR_CHAIN_COMPLETE) >> 16, writeb((DMASCR_DMA_COMPLETE|DMASCR_CHAIN_COMPLETE) >> 16,
card->csr_remap+ DMA_STATUS_CTRL + 2); card->csr_remap+ DMA_STATUS_CTRL + 2);
/* log errors and clear interrupt status */ /* log errors and clear interrupt status */
if (dma_status & DMASCR_ANY_ERR) { if (dma_status & DMASCR_ANY_ERR) {
unsigned int data_log1, data_log2; unsigned int data_log1, data_log2;
@ -668,7 +668,7 @@ HW_TRACE(0x30);
HW_TRACE(0x36); HW_TRACE(0x36);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
/* /*
----------------------------------------------------------------------------------- -----------------------------------------------------------------------------------
@ -761,7 +761,7 @@ static void check_all_batteries(unsigned long ptr)
{ {
int i; int i;
for (i = 0; i < num_cards; i++) for (i = 0; i < num_cards; i++)
if (!(cards[i].flags & UM_FLAG_NO_BATT)) { if (!(cards[i].flags & UM_FLAG_NO_BATT)) {
struct cardinfo *card = &cards[i]; struct cardinfo *card = &cards[i];
spin_lock_bh(&card->lock); spin_lock_bh(&card->lock);
@ -972,7 +972,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i
tasklet_init(&card->tasklet, process_page, (unsigned long)card); tasklet_init(&card->tasklet, process_page, (unsigned long)card);
card->check_batteries = 0; card->check_batteries = 0;
mem_present = readb(card->csr_remap + MEMCTRLSTATUS_MEMORY); mem_present = readb(card->csr_remap + MEMCTRLSTATUS_MEMORY);
switch (mem_present) { switch (mem_present) {
case MEM_128_MB: case MEM_128_MB:
@ -1005,7 +1005,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i
card->battery[1].good = !(batt_status & BATTERY_2_FAILURE); card->battery[1].good = !(batt_status & BATTERY_2_FAILURE);
card->battery[0].last_change = card->battery[1].last_change = jiffies; card->battery[0].last_change = card->battery[1].last_change = jiffies;
if (card->flags & UM_FLAG_NO_BATT) if (card->flags & UM_FLAG_NO_BATT)
dev_printk(KERN_INFO, &card->dev->dev, dev_printk(KERN_INFO, &card->dev->dev,
"Size %d KB\n", card->mm_size); "Size %d KB\n", card->mm_size);
else { else {

14
drivers/block/umem.h
View File

@ -87,13 +87,13 @@
#define DMASCR_DMA_COMPLETE 0x40000 #define DMASCR_DMA_COMPLETE 0x40000
#define DMASCR_CHAIN_COMPLETE 0x80000 #define DMASCR_CHAIN_COMPLETE 0x80000
/* /*
3.SOME PCs HAVE HOST BRIDGES WHICH APPARENTLY DO NOT CORRECTLY HANDLE 3.SOME PCs HAVE HOST BRIDGES WHICH APPARENTLY DO NOT CORRECTLY HANDLE
READ-LINE (0xE) OR READ-MULTIPLE (0xC) PCI COMMAND CODES DURING DMA READ-LINE (0xE) OR READ-MULTIPLE (0xC) PCI COMMAND CODES DURING DMA
TRANSFERS. IN OTHER SYSTEMS THESE COMMAND CODES WILL CAUSE THE HOST BRIDGE TRANSFERS. IN OTHER SYSTEMS THESE COMMAND CODES WILL CAUSE THE HOST BRIDGE
TO ALLOW LONGER BURSTS DURING DMA READ OPERATIONS. THE UPPER FOUR BITS TO ALLOW LONGER BURSTS DURING DMA READ OPERATIONS. THE UPPER FOUR BITS
(31..28) OF THE DMA CSR HAVE BEEN MADE PROGRAMMABLE, SO THAT EITHER A 0x6, (31..28) OF THE DMA CSR HAVE BEEN MADE PROGRAMMABLE, SO THAT EITHER A 0x6,
AN 0xE OR A 0xC CAN BE WRITTEN TO THEM TO SET THE COMMAND CODE USED DURING AN 0xE OR A 0xC CAN BE WRITTEN TO THEM TO SET THE COMMAND CODE USED DURING
DMA READ OPERATIONS. DMA READ OPERATIONS.
*/ */
#define DMASCR_READ 0x60000000 #define DMASCR_READ 0x60000000