From 9f5c474cbd34f517363b27ec2dba4a4f9ea575d1 Mon Sep 17 00:00:00 2001 From: Domen Puncer Date: Sat, 10 Sep 2005 00:27:09 -0700 Subject: [PATCH] --- yaml --- r: 8395 b: refs/heads/master c: 46308c0bbbb066305e0798a2fa03328467a3c7d6 h: refs/heads/master i: 8393: 34262eea6c2aa103bf98cf4a7cfb7d7869465d02 8391: d174abd81c056f50674659ee1a28155b32666675 v: v3 --- [refs] | 2 +- trunk/drivers/block/umem.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 0013d8415175..4af6d8c5594e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80ce45fd961ba8c951adc9857bfda87102b1f5b1 +refs/heads/master: 46308c0bbbb066305e0798a2fa03328467a3c7d6 diff --git a/trunk/drivers/block/umem.c b/trunk/drivers/block/umem.c index 0c4c121d2e79..0f48301342da 100644 --- a/trunk/drivers/block/umem.c +++ b/trunk/drivers/block/umem.c @@ -34,6 +34,7 @@ * - set initialised bit then. */ +//#define DEBUG /* uncomment if you want debugging info (pr_debug) */ #include #include #include @@ -58,10 +59,6 @@ #include #include -#define PRINTK(x...) do {} while (0) -#define dprintk(x...) do {} while (0) -/*#define dprintk(x...) printk(x) */ - #define MM_MAXCARDS 4 #define MM_RAHEAD 2 /* two sectors */ #define MM_BLKSIZE 1024 /* 1k blocks */ @@ -299,7 +296,7 @@ static void mm_start_io(struct cardinfo *card) /* make the last descriptor end the chain */ page = &card->mm_pages[card->Active]; - PRINTK("start_io: %d %d->%d\n", card->Active, page->headcnt, page->cnt-1); + pr_debug("start_io: %d %d->%d\n", card->Active, page->headcnt, page->cnt-1); desc = &page->desc[page->cnt-1]; desc->control_bits |= cpu_to_le32(DMASCR_CHAIN_COMP_EN); @@ -532,7 +529,7 @@ static void process_page(unsigned long data) activate(card); } else { /* haven't finished with this one yet */ - PRINTK("do some more\n"); + pr_debug("do some more\n"); mm_start_io(card); } out_unlock: @@ -555,7 +552,7 @@ static void process_page(unsigned long data) static int mm_make_request(request_queue_t *q, struct bio *bio) { struct cardinfo *card = q->queuedata; - PRINTK("mm_make_request %ld %d\n", bh->b_rsector, bh->b_size); + pr_debug("mm_make_request %ld %d\n", bh->b_rsector, bh->b_size); bio->bi_phys_segments = bio->bi_idx; /* count of completed segments*/ spin_lock_irq(&card->lock);