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

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

diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index a0d4a0522fdc98582e99b1016d482de148e62f16..9eccd0c81d8815fc30a16da28b2e6360b3a69e8f 100644 (file)
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -774,8 +774,7 @@ int ni_init_microcode(struct radeon_device *rdev)
        if (err)
                goto out;
        if (rdev->pfp_fw->size != pfp_req_size) {
-               printk(KERN_ERR
-                      "ni_cp: Bogus length %zu in firmware \"%s\"\n",
+               pr_err("ni_cp: Bogus length %zu in firmware \"%s\"\n",
                       rdev->pfp_fw->size, fw_name);
                err = -EINVAL;
                goto out;
@@ -786,8 +785,7 @@ int ni_init_microcode(struct radeon_device *rdev)
        if (err)
                goto out;
        if (rdev->me_fw->size != me_req_size) {
-               printk(KERN_ERR
-                      "ni_cp: Bogus length %zu in firmware \"%s\"\n",
+               pr_err("ni_cp: Bogus length %zu in firmware \"%s\"\n",
                       rdev->me_fw->size, fw_name);
                err = -EINVAL;
        }
@@ -797,8 +795,7 @@ int ni_init_microcode(struct radeon_device *rdev)
        if (err)
                goto out;
        if (rdev->rlc_fw->size != rlc_req_size) {
-               printk(KERN_ERR
-                      "ni_rlc: Bogus length %zu in firmware \"%s\"\n",
+               pr_err("ni_rlc: Bogus length %zu in firmware \"%s\"\n",
                       rdev->rlc_fw->size, fw_name);
                err = -EINVAL;
        }
@@ -810,8 +807,7 @@ int ni_init_microcode(struct radeon_device *rdev)
                if (err)
                        goto out;
                if (rdev->mc_fw->size != mc_req_size) {
-                       printk(KERN_ERR
-                              "ni_mc: Bogus length %zu in firmware \"%s\"\n",
+                       pr_err("ni_mc: Bogus length %zu in firmware \"%s\"\n",
                               rdev->mc_fw->size, fw_name);
                        err = -EINVAL;
                }
@@ -821,15 +817,12 @@ int ni_init_microcode(struct radeon_device *rdev)
                snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name);
                err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
                if (err) {
-                       printk(KERN_ERR
-                              "smc: error loading firmware \"%s\"\n",
-                              fw_name);
+                       pr_err("smc: error loading firmware \"%s\"\n", fw_name);
                        release_firmware(rdev->smc_fw);
                        rdev->smc_fw = NULL;
                        err = 0;
                } else if (rdev->smc_fw->size != smc_req_size) {
-                       printk(KERN_ERR
-                              "ni_mc: Bogus length %zu in firmware \"%s\"\n",
+                       pr_err("ni_mc: Bogus length %zu in firmware \"%s\"\n",
                               rdev->mc_fw->size, fw_name);
                        err = -EINVAL;
                }
@@ -838,8 +831,7 @@ int ni_init_microcode(struct radeon_device *rdev)
 out:
        if (err) {
                if (err != -EINVAL)
-                       printk(KERN_ERR
-                              "ni_cp: Failed to load firmware \"%s\"\n",
+                       pr_err("ni_cp: Failed to load firmware \"%s\"\n",
                               fw_name);
                release_firmware(rdev->pfp_fw);
                rdev->pfp_fw = NULL;