gpu: drm: amd/radeon: Convert printk(KERN_<LEVEL> to pr_<level>

[sfrench/cifs-2.6.git] / drivers / gpu / drm / radeon / r300.c

diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 7e417d8dc733157c1c3c397246619334c1cc3cc9..21161aa8acbf202d196a0ed7949a4659f4cf8269 100644 (file)
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -387,8 +387,7 @@ static void r300_gpu_init(struct radeon_device *rdev)
        WREG32(R300_GB_TILE_CONFIG, gb_tile_config);
 
        if (r100_gui_wait_for_idle(rdev)) {
-               printk(KERN_WARNING "Failed to wait GUI idle while "
-                      "programming pipes. Bad things might happen.\n");
+               pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n");
        }
 
        tmp = RREG32(R300_DST_PIPE_CONFIG);
@@ -399,14 +398,12 @@ static void r300_gpu_init(struct radeon_device *rdev)
               R300_DC_DC_DISABLE_IGNORE_PE);
 
        if (r100_gui_wait_for_idle(rdev)) {
-               printk(KERN_WARNING "Failed to wait GUI idle while "
-                      "programming pipes. Bad things might happen.\n");
+               pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n");
        }
        if (r300_mc_wait_for_idle(rdev)) {
-               printk(KERN_WARNING "Failed to wait MC idle while "
-                      "programming pipes. Bad things might happen.\n");
+               pr_warn("Failed to wait MC idle while programming pipes. Bad things might happen.\n");
        }
-       DRM_INFO("radeon: %d quad pipes, %d Z pipes initialized.\n",
+       DRM_INFO("radeon: %d quad pipes, %d Z pipes initialized\n",
                 rdev->num_gb_pipes, rdev->num_z_pipes);
 }
 
@@ -1165,7 +1162,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
        }
        return 0;
 fail:
-       printk(KERN_ERR "Forbidden register 0x%04X in cs at %d (val=%08x)\n",
+       pr_err("Forbidden register 0x%04X in cs at %d (val=%08x)\n",
               reg, idx, idx_value);
        return -EINVAL;
 }