drivers/gpu: Convert remaining uses of pr_warning to pr_warn

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/gpu

Prior to this patch, there were 15 uses of pr_warning and
20 uses of pr_warn in drivers/gpu

Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
index 13b35be3174c6791421b0fd690f3c2174272345c..320c705f225582af8d3c68f781259e2752015a39 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
@@ -1544,7 +1544,7 @@ static int smu7_get_evv_voltages(struct pp_hwmgr *hwmgr)
                                        if (vddc >= 2000 || vddc == 0)
                                                return -EINVAL;
                                } else {
-                                       pr_warning("failed to retrieving EVV voltage!\n");
+                                       pr_warn("failed to retrieving EVV voltage!\n");
                                        continue;
                                }
 

diff --git a/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h b/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
index 072880130cfbfeb6d7432f560dbf8760f147c737..f3f9ebb631a5f3383142956e1793ebd8d0936500 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
@@ -37,7 +37,7 @@
 #define PP_ASSERT_WITH_CODE(cond, msg, code)   \
        do {                                    \
                if (!(cond)) {                  \
-                       pr_warning("%s\n", msg);        \
+                       pr_warn("%s\n", msg);   \
                        code;                   \
                }                               \
        } while (0)

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
index 005e7d22c7b3f921e935cc401976c7ab74aeb391..6a320b27aefd17ce96cee015d8e2db82b1dacd91 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
@@ -2205,7 +2205,7 @@ uint32_t fiji_get_offsetof(uint32_t type, uint32_t member)
                        return offsetof(SMU73_Discrete_DpmTable, LowSclkInterruptThreshold);
                }
        }
-       pr_warning("can't get the offset of type %x member %x\n", type, member);
+       pr_warn("can't get the offset of type %x member %x\n", type, member);
        return 0;
 }
 
@@ -2230,7 +2230,7 @@ uint32_t fiji_get_mac_definition(uint32_t value)
                return SMU73_MAX_LEVELS_MVDD;
        }
 
-       pr_warning("can't get the mac of %x\n", value);
+       pr_warn("can't get the mac of %x\n", value);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
index ad82161df8310bd58099b93523af8b072376e424..51adf04ab4b387dafadce6d98325f330841cd7cb 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
@@ -122,7 +122,7 @@ static void iceland_initialize_power_tune_defaults(struct pp_hwmgr *hwmgr)
                break;
        default:
                smu_data->power_tune_defaults = &defaults_iceland;
-               pr_warning("Unknown V.I. Device ID.\n");
+               pr_warn("Unknown V.I. Device ID.\n");
                break;
        }
        return;
@@ -378,7 +378,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
                        return -EINVAL);
 
        if (NULL == hwmgr->dyn_state.cac_leakage_table) {
-               pr_warning("CAC Leakage Table does not exist, using vddc.\n");
+               pr_warn("CAC Leakage Table does not exist, using vddc.\n");
                return 0;
        }
 
@@ -394,7 +394,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
                                *lo = hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc * VOLTAGE_SCALE;
                                *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage * VOLTAGE_SCALE);
                        } else {
-                               pr_warning("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index, using maximum index from CAC table.\n");
+                               pr_warn("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index, using maximum index from CAC table.\n");
                                *lo = hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Vddc * VOLTAGE_SCALE;
                                *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Leakage * VOLTAGE_SCALE);
                        }
@@ -414,7 +414,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
                                        *lo = hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc * VOLTAGE_SCALE;
                                        *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage) * VOLTAGE_SCALE;
                                } else {
-                                       pr_warning("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index in second look up, using maximum index from CAC table.");
+                                       pr_warn("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index in second look up, using maximum index from CAC table.");
                                        *lo = hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Vddc * VOLTAGE_SCALE;
                                        *hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Leakage * VOLTAGE_SCALE);
                                }
@@ -423,7 +423,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
                }
 
                if (!vol_found)
-                       pr_warning("Unable to get std_vddc from SCLK/VDDC Dependency Table, using vddc.\n");
+                       pr_warn("Unable to get std_vddc from SCLK/VDDC Dependency Table, using vddc.\n");
        }
 
        return 0;
@@ -2146,7 +2146,7 @@ uint32_t iceland_get_offsetof(uint32_t type, uint32_t member)
                        return offsetof(SMU71_Discrete_DpmTable, LowSclkInterruptThreshold);
                }
        }
-       pr_warning("can't get the offset of type %x member %x\n", type, member);
+       pr_warn("can't get the offset of type %x member %x\n", type, member);
        return 0;
 }
 
@@ -2169,7 +2169,7 @@ uint32_t iceland_get_mac_definition(uint32_t value)
                return SMU71_MAX_LEVELS_MVDD;
        }
 
-       pr_warning("can't get the mac of %x\n", value);
+       pr_warn("can't get the mac of %x\n", value);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
index 1eedab143aa9c28331f9afefd9f5c138b5e448c9..f68e759e8be287956609314dfd4134739660ca56 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
@@ -2223,7 +2223,7 @@ uint32_t polaris10_get_offsetof(uint32_t type, uint32_t member)
                        return offsetof(SMU74_Discrete_DpmTable, LowSclkInterruptThreshold);
                }
        }
-       pr_warning("can't get the offset of type %x member %x\n", type, member);
+       pr_warn("can't get the offset of type %x member %x\n", type, member);
        return 0;
 }
 
@@ -2250,7 +2250,7 @@ uint32_t polaris10_get_mac_definition(uint32_t value)
                return SMU7_UVD_MCLK_HANDSHAKE_DISABLE;
        }
 
-       pr_warning("can't get the mac of %x\n", value);
+       pr_warn("can't get the mac of %x\n", value);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
index 3491d1ae53cf777e9bdd1d543fdf6e967fb9d895..65d3a4893958297dd0fa30d8f446187c73c40091 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
@@ -2695,7 +2695,7 @@ uint32_t tonga_get_offsetof(uint32_t type, uint32_t member)
                        return offsetof(SMU72_Discrete_DpmTable, LowSclkInterruptThreshold);
                }
        }
-       pr_warning("can't get the offset of type %x member %x\n", type, member);
+       pr_warn("can't get the offset of type %x member %x\n", type, member);
        return 0;
 }
 
@@ -2719,7 +2719,7 @@ uint32_t tonga_get_mac_definition(uint32_t value)
        case SMU_MAX_LEVELS_MVDD:
                return SMU72_MAX_LEVELS_MVDD;
        }
-       pr_warning("can't get the mac value %x\n", value);
+       pr_warn("can't get the mac value %x\n", value);
 
        return 0;
 }