Change a bunch of "printk" in commented out debug code into "printf" and

kill the compat define. Should have done this ages ago.

5 files changed, 19 insertions, 31 deletions

diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h
index b618b3915f3..aa67c20eaf0 100644
--- a/sys/dev/pci/drm/drmP.h
+++ b/sys/dev/pci/drm/drmP.h
@@ -87,9 +87,6 @@
 #define DRM_UNLOCK()		rw_exit_write(&dev->dev_lock)
 #define DRM_MAXUNITS	8
 
-/* Deal with netbsd code where only the print statements differ */
-#define printk printf
-
 /* D_CLONE only supports one device, this will be fixed eventually */
 #define drm_get_device_from_kdev(_kdev)	\
 	(drm_cd.cd_ndevs > 0 ? drm_cd.cd_devs[0] : NULL)
diff --git a/sys/dev/pci/drm/i915_dma.c b/sys/dev/pci/drm/i915_dma.c
index c70136ec840..f426c493e6c 100644
--- a/sys/dev/pci/drm/i915_dma.c
+++ b/sys/dev/pci/drm/i915_dma.c
@@ -202,7 +202,7 @@ int i915_dma_init(struct drm_device *dev, void *data,
  * instruction detected will be given a size of zero, which is a
  * signal to abort the rest of the buffer.
  */
-static int do_validate_cmd(int cmd)
+static int validate_cmd(int cmd)
 {
 	switch (((cmd >> 29) & 0x7)) {
 	case 0x0:
@@ -260,15 +260,6 @@ static int do_validate_cmd(int cmd)
 	return 0;
 }
 
-static int validate_cmd(int cmd)
-{
-	int ret = do_validate_cmd(cmd);
-
-/*	printk("validate_cmd( %x ): %d\n", cmd, ret); */
-
-	return ret;
-}
-
 static int i915_emit_cmds(struct drm_device *dev, int __user *buffer,
 			  int dwords)
 {
diff --git a/sys/dev/pci/drm/mga_state.c b/sys/dev/pci/drm/mga_state.c
index 3db6c44415d..d9ad1f4e5ca 100644
--- a/sys/dev/pci/drm/mga_state.c
+++ b/sys/dev/pci/drm/mga_state.c
@@ -158,7 +158,7 @@ static __inline__ void mga_g400_emit_tex0(drm_mga_private_t * dev_priv)
 	drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[0];
 	DMA_LOCALS;
 
-/*	printk("mga_g400_emit_tex0 %x %x %x\n", tex->texorg, */
+/*	printf("mga_g400_emit_tex0 %x %x %x\n", tex->texorg, */
 /*	       tex->texctl, tex->texctl2); */
 
 	BEGIN_DMA(6);
@@ -202,7 +202,7 @@ static __inline__ void mga_g400_emit_tex1(drm_mga_private_t * dev_priv)
 	drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[1];
 	DMA_LOCALS;
 
-/*	printk("mga_g400_emit_tex1 %x %x %x\n", tex->texorg,  */
+/*	printf("mga_g400_emit_tex1 %x %x %x\n", tex->texorg,  */
 /*	       tex->texctl, tex->texctl2); */
 
 	BEGIN_DMA(5);
@@ -272,7 +272,7 @@ static __inline__ void mga_g400_emit_pipe(drm_mga_private_t * dev_priv)
 	unsigned int pipe = sarea_priv->warp_pipe;
 	DMA_LOCALS;
 
-/*	printk("mga_g400_emit_pipe %x\n", pipe); */
+/*	printf("mga_g400_emit_pipe %x\n", pipe); */
 
 	BEGIN_DMA(10);
 
diff --git a/sys/dev/pci/drm/r128_cce.c b/sys/dev/pci/drm/r128_cce.c
index f80a97f78d9..3b04dd03d42 100644
--- a/sys/dev/pci/drm/r128_cce.c
+++ b/sys/dev/pci/drm/r128_cce.c
@@ -92,17 +92,17 @@ static int R128_READ_PLL(struct drm_device * dev, int addr)
 #if R128_FIFO_DEBUG
 static void r128_status(drm_r128_private_t * dev_priv)
 {
-	printk("GUI_STAT           = 0x%08x\n",
+	printf("GUI_STAT           = 0x%08x\n",
 	       (unsigned int)R128_READ(R128_GUI_STAT));
-	printk("PM4_STAT           = 0x%08x\n",
+	printf("PM4_STAT           = 0x%08x\n",
 	       (unsigned int)R128_READ(R128_PM4_STAT));
-	printk("PM4_BUFFER_DL_WPTR = 0x%08x\n",
+	printf("PM4_BUFFER_DL_WPTR = 0x%08x\n",
 	       (unsigned int)R128_READ(R128_PM4_BUFFER_DL_WPTR));
-	printk("PM4_BUFFER_DL_RPTR = 0x%08x\n",
+	printf("PM4_BUFFER_DL_RPTR = 0x%08x\n",
 	       (unsigned int)R128_READ(R128_PM4_BUFFER_DL_RPTR));
-	printk("PM4_MICRO_CNTL     = 0x%08x\n",
+	printf("PM4_MICRO_CNTL     = 0x%08x\n",
 	       (unsigned int)R128_READ(R128_PM4_MICRO_CNTL));
-	printk("PM4_BUFFER_CNTL    = 0x%08x\n",
+	printf("PM4_BUFFER_CNTL    = 0x%08x\n",
 	       (unsigned int)R128_READ(R128_PM4_BUFFER_CNTL));
 }
 #endif
diff --git a/sys/dev/pci/drm/radeon_cp.c b/sys/dev/pci/drm/radeon_cp.c
index 21c786a23ba..796ca86dbc9 100644
--- a/sys/dev/pci/drm/radeon_cp.c
+++ b/sys/dev/pci/drm/radeon_cp.c
@@ -196,22 +196,22 @@ RADEON_READ_PCIE(drm_radeon_private_t *dev_priv, int addr)
 static void
 radeon_status(drm_radeon_private_t *dev_priv)
 {
-	printk("%s:\n", __FUNCTION__);
-	printk("RBBM_STATUS = 0x%08x\n",
+	printf("%s:\n", __FUNCTION__);
+	printf("RBBM_STATUS = 0x%08x\n",
 	       (unsigned int)RADEON_READ(RADEON_RBBM_STATUS));
-	printk("CP_RB_RTPR = 0x%08x\n",
+	printf("CP_RB_RTPR = 0x%08x\n",
 	       (unsigned int)RADEON_READ(RADEON_CP_RB_RPTR));
-	printk("CP_RB_WTPR = 0x%08x\n",
+	printf("CP_RB_WTPR = 0x%08x\n",
 	       (unsigned int)RADEON_READ(RADEON_CP_RB_WPTR));
-	printk("AIC_CNTL = 0x%08x\n",
+	printf("AIC_CNTL = 0x%08x\n",
 	       (unsigned int)RADEON_READ(RADEON_AIC_CNTL));
-	printk("AIC_STAT = 0x%08x\n",
+	printf("AIC_STAT = 0x%08x\n",
 	       (unsigned int)RADEON_READ(RADEON_AIC_STAT));
-	printk("AIC_PT_BASE = 0x%08x\n",
+	printf("AIC_PT_BASE = 0x%08x\n",
 	       (unsigned int)RADEON_READ(RADEON_AIC_PT_BASE));
-	printk("TLB_ADDR = 0x%08x\n",
+	printf("TLB_ADDR = 0x%08x\n",
 	       (unsigned int)RADEON_READ(RADEON_AIC_TLB_ADDR));
-	printk("TLB_DATA = 0x%08x\n",
+	printf("TLB_DATA = 0x%08x\n",
 	       (unsigned int)RADEON_READ(RADEON_AIC_TLB_DATA));
 }
 #endif