Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / drivers / gpu / drm / amd / powerplay / hwmgr / functiontables.c

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c b/drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c
index 71822ae73a124c138301ca175af94283fd3c0fd9..bc7d8bd7e7cbe2d393515f60fe7b0581b06d543d 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c
@@ -35,7 +35,7 @@ static int phm_run_table(struct pp_hwmgr *hwmgr,
        phm_table_function *function;
 
        if (rt_table->function_list == NULL) {
-               pr_debug("[ powerplay ] this function not implement!\n");
+               pr_debug("this function not implement!\n");
                return 0;
        }
 
@@ -63,14 +63,14 @@ int phm_dispatch_table(struct pp_hwmgr *hwmgr,
        void *temp_storage;
 
        if (hwmgr == NULL || rt_table == NULL) {
-               printk(KERN_ERR "[ powerplay ] Invalid Parameter!\n");
+               pr_err("Invalid Parameter!\n");
                return -EINVAL;
        }
 
        if (0 != rt_table->storage_size) {
                temp_storage = kzalloc(rt_table->storage_size, GFP_KERNEL);
                if (temp_storage == NULL) {
-                       printk(KERN_ERR "[ powerplay ] Could not allocate table temporary storage\n");
+                       pr_err("Could not allocate table temporary storage\n");
                        return -ENOMEM;
                }
        } else {
@@ -95,7 +95,7 @@ int phm_construct_table(struct pp_hwmgr *hwmgr,
        phm_table_function *rtf;
 
        if (hwmgr == NULL || master_table == NULL || rt_table == NULL) {
-               printk(KERN_ERR "[ powerplay ] Invalid Parameter!\n");
+               pr_err("Invalid Parameter!\n");
                return -EINVAL;
        }
 
@@ -116,7 +116,7 @@ int phm_construct_table(struct pp_hwmgr *hwmgr,
        for (table_item = master_table->master_list;
                NULL != table_item->tableFunction; table_item++) {
                if ((rtf - run_time_list) > function_count) {
-                       printk(KERN_ERR "[ powerplay ] Check function results have changed\n");
+                       pr_err("Check function results have changed\n");
                        kfree(run_time_list);
                        return -EINVAL;
                }
@@ -128,7 +128,7 @@ int phm_construct_table(struct pp_hwmgr *hwmgr,
        }
 
        if ((rtf - run_time_list) > function_count) {
-               printk(KERN_ERR "[ powerplay ] Check function results have changed\n");
+               pr_err("Check function results have changed\n");
                kfree(run_time_list);
                return -EINVAL;
        }
@@ -144,7 +144,7 @@ int phm_destroy_table(struct pp_hwmgr *hwmgr,
                      struct phm_runtime_table_header *rt_table)
 {
        if (hwmgr == NULL || rt_table == NULL) {
-               printk(KERN_ERR "[ powerplay ] Invalid Parameter\n");
+               pr_err("Invalid Parameter\n");
                return -EINVAL;
        }