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

Commit 3e684eae authored by Márton Németh's avatar Márton Németh Committed by Dave Airlie
Browse files

drm: cleanup DRM_DEBUG() parameters 



As DRM_DEBUG macro already prints out the __FUNCTION__ string (see
drivers/char/drm/drmP.h), it is not worth doing this again. At some
other places the ending "\n" was added.

airlied:- I cleaned up a few that this patch missed also

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 4d1f7888

drivers/char/drm/ati_pcigart.c

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static void *drm_ati_alloc_pcigart_table(int order) 
	struct page *page;

	int i;



	DRM_DEBUG("%s: alloc %d order\n", __FUNCTION__, order);

	DRM_DEBUG("%d order\n", order);



	address = __get_free_pages(GFP_KERNEL | __GFP_COMP,

				   order);
@@ -54,7 +54,7 @@ static void *drm_ati_alloc_pcigart_table(int order) 
	for (i = 0; i < order; i++, page++)

		SetPageReserved(page);



	DRM_DEBUG("%s: returning 0x%08lx\n", __FUNCTION__, address);

	DRM_DEBUG("returning 0x%08lx\n", address);

	return (void *)address;

}
@@ -63,7 +63,7 @@ static void drm_ati_free_pcigart_table(void *address, int order) 
	struct page *page;

	int i;

	int num_pages = 1 << order;

	DRM_DEBUG("%s\n", __FUNCTION__);

	DRM_DEBUG("\n");



	page = virt_to_page((unsigned long)address);

drivers/char/drm/drm_irq.c

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static int drm_irq_install(struct drm_device * dev) 
	dev->irq_enabled = 1;

	mutex_unlock(&dev->struct_mutex);



	DRM_DEBUG("%s: irq=%d\n", __FUNCTION__, dev->irq);

	DRM_DEBUG("irq=%d\n", dev->irq);



	if (drm_core_check_feature(dev, DRIVER_IRQ_VBL)) {

		init_waitqueue_head(&dev->vbl_queue);
@@ -164,7 +164,7 @@ int drm_irq_uninstall(struct drm_device * dev) 
	if (!irq_enabled)

		return -EINVAL;



	DRM_DEBUG("%s: irq=%d\n", __FUNCTION__, dev->irq);

	DRM_DEBUG("irq=%d\n", dev->irq);



	dev->driver->irq_uninstall(dev);

drivers/char/drm/drm_scatter.c

+5 −5
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request) 
	struct drm_sg_mem *entry;

	unsigned long pages, i, j;



	DRM_DEBUG("%s\n", __FUNCTION__);

	DRM_DEBUG("\n");



	if (!drm_core_check_feature(dev, DRIVER_SG))

		return -EINVAL;
@@ -81,7 +81,7 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request) 


	memset(entry, 0, sizeof(*entry));

	pages = (request->size + PAGE_SIZE - 1) / PAGE_SIZE;

	DRM_DEBUG("sg size=%ld pages=%ld\n", request->size, pages);

	DRM_DEBUG("size=%ld pages=%ld\n", request->size, pages);



	entry->pages = pages;

	entry->pagelist = drm_alloc(pages * sizeof(*entry->pagelist),
@@ -122,8 +122,8 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request) 


	entry->handle = ScatterHandle((unsigned long)entry->virtual);



	DRM_DEBUG("sg alloc handle  = %08lx\n", entry->handle);

	DRM_DEBUG("sg alloc virtual = %p\n", entry->virtual);

	DRM_DEBUG("handle  = %08lx\n", entry->handle);

	DRM_DEBUG("virtual = %p\n", entry->virtual);



	for (i = (unsigned long)entry->virtual, j = 0; j < pages;

	     i += PAGE_SIZE, j++) {
@@ -210,7 +210,7 @@ int drm_sg_free(struct drm_device *dev, void *data, 
	if (!entry || entry->handle != request->handle)

		return -EINVAL;



	DRM_DEBUG("sg free virtual  = %p\n", entry->virtual);

	DRM_DEBUG("virtual  = %p\n", entry->virtual);



	drm_sg_cleanup(entry);

drivers/char/drm/drm_vm.c

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma, 
		return NOPAGE_SIGBUS;

	get_page(page);



	DRM_DEBUG("shm_nopage 0x%lx\n", address);

	DRM_DEBUG("0x%lx\n", address);

	return page;

}
@@ -294,7 +294,7 @@ static __inline__ struct page *drm_do_vm_dma_nopage(struct vm_area_struct *vma, 


	get_page(page);



	DRM_DEBUG("dma_nopage 0x%lx (page %lu)\n", address, page_nr);

	DRM_DEBUG("0x%lx (page %lu)\n", address, page_nr);

	return page;

}

drivers/char/drm/i810_dma.c

+8 −14
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ static void i810EmitState(struct drm_device * dev) 
	drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;

	unsigned int dirty = sarea_priv->dirty;



	DRM_DEBUG("%s %x\n", __FUNCTION__, dirty);

	DRM_DEBUG("%x\n", dirty);



	if (dirty & I810_UPLOAD_BUFFERS) {

		i810EmitDestVerified(dev, sarea_priv->BufferState);
@@ -802,8 +802,7 @@ static void i810_dma_dispatch_flip(struct drm_device * dev) 
	int pitch = dev_priv->pitch;

	RING_LOCALS;



	DRM_DEBUG("%s: page=%d pfCurrentPage=%d\n",

		  __FUNCTION__,

	DRM_DEBUG("page=%d pfCurrentPage=%d\n",

		  dev_priv->current_page,

		  dev_priv->sarea_priv->pf_current_page);
@@ -848,8 +847,6 @@ static void i810_dma_quiescent(struct drm_device * dev) 
	drm_i810_private_t *dev_priv = dev->dev_private;

	RING_LOCALS;



/*	printk("%s\n", __FUNCTION__); */



	i810_kernel_lost_context(dev);



	BEGIN_LP_RING(4);
@@ -869,8 +866,6 @@ static int i810_flush_queue(struct drm_device * dev) 
	int i, ret = 0;

	RING_LOCALS;



/*	printk("%s\n", __FUNCTION__); */



	i810_kernel_lost_context(dev);



	BEGIN_LP_RING(2);
@@ -949,7 +944,7 @@ static int i810_dma_vertex(struct drm_device *dev, void *data, 


	LOCK_TEST_WITH_RETURN(dev, file_priv);



	DRM_DEBUG("i810 dma vertex, idx %d used %d discard %d\n",

	DRM_DEBUG("idx %d used %d discard %d\n",

		  vertex->idx, vertex->used, vertex->discard);



	if (vertex->idx < 0 || vertex->idx > dma->buf_count)
@@ -987,7 +982,7 @@ static int i810_clear_bufs(struct drm_device *dev, void *data, 
static int i810_swap_bufs(struct drm_device *dev, void *data,

			  struct drm_file *file_priv)

{

	DRM_DEBUG("i810_swap_bufs\n");

	DRM_DEBUG("\n");



	LOCK_TEST_WITH_RETURN(dev, file_priv);
@@ -1068,11 +1063,10 @@ static void i810_dma_dispatch_mc(struct drm_device * dev, struct drm_buf * buf, 


	sarea_priv->dirty = 0x7f;



	DRM_DEBUG("dispatch mc addr 0x%lx, used 0x%x\n", address, used);

	DRM_DEBUG("addr 0x%lx, used 0x%x\n", address, used);



	dev_priv->counter++;

	DRM_DEBUG("dispatch counter : %ld\n", dev_priv->counter);

	DRM_DEBUG("i810_dma_dispatch_mc\n");

	DRM_DEBUG("start : %lx\n", start);

	DRM_DEBUG("used : %d\n", used);

	DRM_DEBUG("start + used - 4 : %ld\n", start + used - 4);
@@ -1179,7 +1173,7 @@ static void i810_do_init_pageflip(struct drm_device * dev) 
{

	drm_i810_private_t *dev_priv = dev->dev_private;



	DRM_DEBUG("%s\n", __FUNCTION__);

	DRM_DEBUG("\n");

	dev_priv->page_flipping = 1;

	dev_priv->current_page = 0;

	dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
@@ -1189,7 +1183,7 @@ static int i810_do_cleanup_pageflip(struct drm_device * dev) 
{

	drm_i810_private_t *dev_priv = dev->dev_private;



	DRM_DEBUG("%s\n", __FUNCTION__);

	DRM_DEBUG("\n");

	if (dev_priv->current_page != 0)

		i810_dma_dispatch_flip(dev);
@@ -1202,7 +1196,7 @@ static int i810_flip_bufs(struct drm_device *dev, void *data, 
{

	drm_i810_private_t *dev_priv = dev->dev_private;



	DRM_DEBUG("%s\n", __FUNCTION__);

	DRM_DEBUG("\n");



	LOCK_TEST_WITH_RETURN(dev, file_priv);