Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1583130 > unrolled thread

[PATCH 17/35] drivers/gpu: Convert remaining uses of pr_warning to pr_warn

Started byJoe Perches <joe@perches.com>
First post2017-02-17 08:20 +0100
Last post2017-02-23 16:20 +0100
Articles 3 — 3 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH 17/35] drivers/gpu: Convert remaining uses of pr_warning to pr_warn Joe Perches <joe@perches.com> - 2017-02-17 08:20 +0100
    Re: [PATCH 17/35] drivers/gpu: Convert remaining uses of pr_warning  to pr_warn Edward O'Callaghan <funfunctor@folklore1984.net> - 2017-02-18 06:10 +0100
      Re: [PATCH 17/35] drivers/gpu: Convert remaining uses of pr_warning  to pr_warn Alex Deucher <alexdeucher@gmail.com> - 2017-02-23 16:20 +0100

#1583130 — [PATCH 17/35] drivers/gpu: Convert remaining uses of pr_warning to pr_warn

FromJoe Perches <joe@perches.com>
Date2017-02-17 08:20 +0100
Subject[PATCH 17/35] drivers/gpu: Convert remaining uses of pr_warning to pr_warn
Message-ID<tbKZI-176-21@gated-at.bofh.it>
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

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c     |  2 +-
 drivers/gpu/drm/amd/powerplay/inc/pp_debug.h         |  2 +-
 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c      |  4 ++--
 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c   | 14 +++++++-------
 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c |  4 ++--
 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c     |  4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
index b1de9e8ccdbc..83266408634e 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
@@ -1535,7 +1535,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 072880130cfb..f3f9ebb631a5 100644
--- 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 0f7a77b7312e..5450f5ef8e89 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
@@ -2131,7 +2131,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;
 }
 
@@ -2156,7 +2156,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 ad82161df831..51adf04ab4b3 100644
--- 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 0e26900e459e..deec874d874f 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
@@ -2180,7 +2180,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;
 }
 
@@ -2207,7 +2207,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 331b0aba4a13..4d1439a498eb 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
@@ -2657,7 +2657,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;
 }
 
@@ -2681,7 +2681,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;
 }
-- 
2.10.0.rc2.1.g053435c

[toc] | [next] | [standalone]

#1583844 — Re: [PATCH 17/35] drivers/gpu: Convert remaining uses of pr_warning to pr_warn

FromEdward O'Callaghan <funfunctor@folklore1984.net>
Date2017-02-18 06:10 +0100
SubjectRe: [PATCH 17/35] drivers/gpu: Convert remaining uses of pr_warning to pr_warn
Message-ID<tc5rr-5Se-7@gated-at.bofh.it>
In reply to#1583130

[Multipart message — attachments visible in raw view] — view raw

On 02/18/2017 01:22 AM, Christian König wrote:
> Am 17.02.2017 um 08:11 schrieb Joe Perches:
>> 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
>>
>> Signed-off-by: Joe Perches <joe@perches.com>
> 
> Acked-by: Christian König <christian.koenig@amd.com>.

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>

> 
>> ---
>>   drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c     |  2 +-
>>   drivers/gpu/drm/amd/powerplay/inc/pp_debug.h         |  2 +-
>>   drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c      |  4 ++--
>>   drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c   | 14
>> +++++++-------
>>   drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c |  4 ++--
>>   drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c     |  4 ++--
>>   6 files changed, 15 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>> b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>> index b1de9e8ccdbc..83266408634e 100644
>> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>> @@ -1535,7 +1535,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 072880130cfb..f3f9ebb631a5 100644
>> --- 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 0f7a77b7312e..5450f5ef8e89 100644
>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
>> @@ -2131,7 +2131,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;
>>   }
>>   @@ -2156,7 +2156,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 ad82161df831..51adf04ab4b3 100644
>> --- 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 0e26900e459e..deec874d874f 100644
>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
>> @@ -2180,7 +2180,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;
>>   }
>>   @@ -2207,7 +2207,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 331b0aba4a13..4d1439a498eb 100644
>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
>> @@ -2657,7 +2657,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;
>>   }
>>   @@ -2681,7 +2681,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;
>>   }
> 
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[toc] | [prev] | [next] | [standalone]

#1586951 — Re: [PATCH 17/35] drivers/gpu: Convert remaining uses of pr_warning to pr_warn

FromAlex Deucher <alexdeucher@gmail.com>
Date2017-02-23 16:20 +0100
SubjectRe: [PATCH 17/35] drivers/gpu: Convert remaining uses of pr_warning to pr_warn
Message-ID<te3lw-323-17@gated-at.bofh.it>
In reply to#1583844
On Sat, Feb 18, 2017 at 12:03 AM, Edward O'Callaghan
<funfunctor@folklore1984.net> wrote:
>
>
> On 02/18/2017 01:22 AM, Christian König wrote:
>> Am 17.02.2017 um 08:11 schrieb Joe Perches:
>>> 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
>>>
>>> Signed-off-by: Joe Perches <joe@perches.com>
>>
>> Acked-by: Christian König <christian.koenig@amd.com>.
>
> Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>

Applied.  thanks!

Alex


>
>>
>>> ---
>>>   drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c     |  2 +-
>>>   drivers/gpu/drm/amd/powerplay/inc/pp_debug.h         |  2 +-
>>>   drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c      |  4 ++--
>>>   drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c   | 14
>>> +++++++-------
>>>   drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c |  4 ++--
>>>   drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c     |  4 ++--
>>>   6 files changed, 15 insertions(+), 15 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>>> b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>>> index b1de9e8ccdbc..83266408634e 100644
>>> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>>> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>>> @@ -1535,7 +1535,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 072880130cfb..f3f9ebb631a5 100644
>>> --- 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 0f7a77b7312e..5450f5ef8e89 100644
>>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
>>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
>>> @@ -2131,7 +2131,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;
>>>   }
>>>   @@ -2156,7 +2156,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 ad82161df831..51adf04ab4b3 100644
>>> --- 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 0e26900e459e..deec874d874f 100644
>>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
>>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
>>> @@ -2180,7 +2180,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;
>>>   }
>>>   @@ -2207,7 +2207,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 331b0aba4a13..4d1439a498eb 100644
>>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
>>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
>>> @@ -2657,7 +2657,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;
>>>   }
>>>   @@ -2681,7 +2681,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;
>>>   }
>>
>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web