Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46308c0b authored by Domen Puncer's avatar Domen Puncer Committed by Linus Torvalds
Browse files

[PATCH] janitor: block/umem: replace PRINTK with pr_debug 



Removed unused dprintk, replaced PRINTK with pr_debug.

Signed-off-by: default avatarMaximilian Attems <janitor@sternwelten.at>
Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 80ce45fd

drivers/block/umem.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ 
 *			 - set initialised bit then.

 *			 - set initialised bit then.

 */

 */





//#define DEBUG /* uncomment if you want debugging info (pr_debug) */

#include <linux/config.h>

#include <linux/config.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/fs.h>

#include <linux/fs.h>
@@ -58,10 +59,6 @@ 
#include <asm/uaccess.h>

#include <asm/uaccess.h>

#include <asm/io.h>

#include <asm/io.h>





#define PRINTK(x...) do {} while (0)

#define dprintk(x...) do {} while (0)

/*#define dprintk(x...) printk(x) */



#define MM_MAXCARDS 4

#define MM_MAXCARDS 4

#define MM_RAHEAD 2      /* two sectors */

#define MM_RAHEAD 2      /* two sectors */

#define MM_BLKSIZE 1024  /* 1k blocks */

#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 */

	/* make the last descriptor end the chain */

	page = &card->mm_pages[card->Active];

	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 = &page->desc[page->cnt-1];





	desc->control_bits |= cpu_to_le32(DMASCR_CHAIN_COMP_EN);

	desc->control_bits |= cpu_to_le32(DMASCR_CHAIN_COMP_EN);
@@ -532,7 +529,7 @@ static void process_page(unsigned long data) 
		activate(card);

		activate(card);

	} else {

	} else {

		/* haven't finished with this one yet */

		/* haven't finished with this one yet */

		PRINTK("do some more\n");

		pr_debug("do some more\n");

		mm_start_io(card);

		mm_start_io(card);

	}

	}

 out_unlock:

 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)

static int mm_make_request(request_queue_t *q, struct bio *bio)

{

{

	struct cardinfo *card = q->queuedata;

	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*/

	bio->bi_phys_segments = bio->bi_idx; /* count of completed segments*/

	spin_lock_irq(&card->lock);

	spin_lock_irq(&card->lock);