From 0c16fa87af4c1f69d06b3a1d8b4c884b513e3827 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 6 Aug 2009 17:09:21 +0100 Subject: Tidy up, and remove debug Tidy up a few lines, and remove debug lines which would slow us down. Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-cmdq.c | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'drivers/mfd') diff --git a/drivers/mfd/glamo/glamo-cmdq.c b/drivers/mfd/glamo/glamo-cmdq.c index dd1c89646f3..0e1de5bd27e 100644 --- a/drivers/mfd/glamo/glamo-cmdq.c +++ b/drivers/mfd/glamo/glamo-cmdq.c @@ -99,9 +99,6 @@ static int glamo_add_to_ring(struct glamodrm_handle *gdrm, u16 *addr, size_t ring_write, ring_read; size_t new_ring_write; - printk(KERN_INFO "[glamo-drm] glamo add to ring %d bytes," - " ring_read: %d\n", count, glamo_get_read(gdrm)); - down(&gdrm->add_to_ring); ring_write = glamo_get_write(gdrm); @@ -159,7 +156,7 @@ static int glamo_add_to_ring(struct glamodrm_handle *gdrm, u16 *addr, } else { - memcpy_toio(gdrm->cmdq_base+ring_write, addr,count); + memcpy_toio(gdrm->cmdq_base+ring_write, addr, count); } @@ -170,13 +167,6 @@ static int glamo_add_to_ring(struct glamodrm_handle *gdrm, u16 *addr, up(&gdrm->add_to_ring); - printk(KERN_INFO "[glamo-drm] IOCTL2 CMDQ at: %d-%d, CMDQ CTRL: %d," - " CMDQ STATUS: %d\n", - glamo_get_read(gdrm), glamo_get_write(gdrm), - reg_read(gdrm, GLAMO_REG_CMDQ_CONTROL), - reg_read(gdrm, GLAMO_REG_CMDQ_STATUS) ); - - return 0; } @@ -221,9 +211,6 @@ static int glamo_do_relocation(struct glamodrm_handle *gdrm, u32 addr; u16 addr_low, addr_high; - printk(KERN_INFO "[glamo-drm] Relocating object handle %i " - "at position 0x%x\n", handle, offset); - if ( offset > cbuf->bufsz ) { printk(KERN_WARNING "[glamo-drm] Offset out of range " "for this relocation!\n"); @@ -248,8 +235,6 @@ static int glamo_do_relocation(struct glamodrm_handle *gdrm, addr = GLAMO_OFFSET_FB + gobj->block->start; addr_low = addr & 0xffff; addr_high = (addr >> 16) & 0x7f; - printk(KERN_INFO "Addr low 0x%x, high 0x%x\n", - addr_low, addr_high); /* FIXME: Should really check that the register is a * valid one for this relocation. */ @@ -282,12 +267,6 @@ int glamo_ioctl_cmdbuf(struct drm_device *dev, void *data, gdrm = dev->dev_private; - printk(KERN_INFO "[glamo-drm] IOCTL CMDQ at: %d-%d, CMDQ CTRL: %d," - " CMDQ STATUS: %d\n", - glamo_get_read(gdrm), glamo_get_write(gdrm), - reg_read(gdrm, GLAMO_REG_CMDQ_CONTROL), - reg_read(gdrm, GLAMO_REG_CMDQ_STATUS) ); - count = cbuf->bufsz; if ( count > PAGE_SIZE ) return -EINVAL; @@ -360,12 +339,6 @@ int glamo_cmdq_init(struct glamodrm_handle *gdrm) 5 << 8 | /* no interrupt */ 8 << 4); /* HQ threshold */ - printk(KERN_INFO "[glamo-drm] INIT CMDQ at: %d-%d, CMDQ CTRL: %d," - " CMDQ STATUS: %d\n", - glamo_get_read(gdrm), glamo_get_write(gdrm), - reg_read(gdrm, GLAMO_REG_CMDQ_CONTROL), - reg_read(gdrm, GLAMO_REG_CMDQ_STATUS) ); - return 0; } -- cgit v1.2.3