diff options
Diffstat (limited to 'drivers/block/umem.c')
| -rw-r--r-- | drivers/block/umem.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/block/umem.c b/drivers/block/umem.c index 0c4c121d2e79..0f48301342da 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | * - set initialised bit then. | 34 | * - set initialised bit then. |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | //#define DEBUG /* uncomment if you want debugging info (pr_debug) */ | ||
| 37 | #include <linux/config.h> | 38 | #include <linux/config.h> |
| 38 | #include <linux/sched.h> | 39 | #include <linux/sched.h> |
| 39 | #include <linux/fs.h> | 40 | #include <linux/fs.h> |
| @@ -58,10 +59,6 @@ | |||
| 58 | #include <asm/uaccess.h> | 59 | #include <asm/uaccess.h> |
| 59 | #include <asm/io.h> | 60 | #include <asm/io.h> |
| 60 | 61 | ||
| 61 | #define PRINTK(x...) do {} while (0) | ||
| 62 | #define dprintk(x...) do {} while (0) | ||
| 63 | /*#define dprintk(x...) printk(x) */ | ||
| 64 | |||
| 65 | #define MM_MAXCARDS 4 | 62 | #define MM_MAXCARDS 4 |
| 66 | #define MM_RAHEAD 2 /* two sectors */ | 63 | #define MM_RAHEAD 2 /* two sectors */ |
| 67 | #define MM_BLKSIZE 1024 /* 1k blocks */ | 64 | #define MM_BLKSIZE 1024 /* 1k blocks */ |
| @@ -299,7 +296,7 @@ static void mm_start_io(struct cardinfo *card) | |||
| 299 | 296 | ||
| 300 | /* make the last descriptor end the chain */ | 297 | /* make the last descriptor end the chain */ |
| 301 | page = &card->mm_pages[card->Active]; | 298 | page = &card->mm_pages[card->Active]; |
| 302 | PRINTK("start_io: %d %d->%d\n", card->Active, page->headcnt, page->cnt-1); | 299 | pr_debug("start_io: %d %d->%d\n", card->Active, page->headcnt, page->cnt-1); |
| 303 | desc = &page->desc[page->cnt-1]; | 300 | desc = &page->desc[page->cnt-1]; |
| 304 | 301 | ||
| 305 | desc->control_bits |= cpu_to_le32(DMASCR_CHAIN_COMP_EN); | 302 | desc->control_bits |= cpu_to_le32(DMASCR_CHAIN_COMP_EN); |
| @@ -532,7 +529,7 @@ static void process_page(unsigned long data) | |||
| 532 | activate(card); | 529 | activate(card); |
| 533 | } else { | 530 | } else { |
| 534 | /* haven't finished with this one yet */ | 531 | /* haven't finished with this one yet */ |
| 535 | PRINTK("do some more\n"); | 532 | pr_debug("do some more\n"); |
| 536 | mm_start_io(card); | 533 | mm_start_io(card); |
| 537 | } | 534 | } |
| 538 | out_unlock: | 535 | out_unlock: |
| @@ -555,7 +552,7 @@ static void process_page(unsigned long data) | |||
| 555 | static int mm_make_request(request_queue_t *q, struct bio *bio) | 552 | static int mm_make_request(request_queue_t *q, struct bio *bio) |
| 556 | { | 553 | { |
| 557 | struct cardinfo *card = q->queuedata; | 554 | struct cardinfo *card = q->queuedata; |
| 558 | PRINTK("mm_make_request %ld %d\n", bh->b_rsector, bh->b_size); | 555 | pr_debug("mm_make_request %ld %d\n", bh->b_rsector, bh->b_size); |
| 559 | 556 | ||
| 560 | bio->bi_phys_segments = bio->bi_idx; /* count of completed segments*/ | 557 | bio->bi_phys_segments = bio->bi_idx; /* count of completed segments*/ |
| 561 | spin_lock_irq(&card->lock); | 558 | spin_lock_irq(&card->lock); |
