From: Joe Perches <joe@perches.com>
To: linux-kernel@vger.kernel.org
Cc: "Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"David Airlie" <airlied@linux.ie>,
amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: [PATCH 17/35] drivers/gpu: Convert remaining uses of pr_warning to pr_warn
Date: Thu, 16 Feb 2017 23:11:30 -0800 [thread overview]
Message-ID: <89288c2354690be744b72b27e39f317cb1c5310d.1487314667.git.joe@perches.com> (raw)
In-Reply-To: <cover.1487314666.git.joe@perches.com>
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
next prev parent reply other threads:[~2017-02-17 7:13 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-17 7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
2017-02-17 7:11 ` [PATCH 01/35] alpha: Convert remaining uses of " Joe Perches
2017-02-17 7:11 ` [PATCH 02/35] ARM: ep93xx: " Joe Perches
2017-02-17 16:26 ` Hartley Sweeten
2017-02-17 7:11 ` [PATCH 03/35] arm64: " Joe Perches
2017-02-17 10:52 ` Mark Rutland
2017-02-17 7:11 ` [PATCH 04/35] arch/blackfin: " Joe Perches
2017-02-17 7:11 ` [PATCH 05/35] ia64: Convert remaining use " Joe Perches
2017-02-17 7:11 ` [PATCH 06/35] powerpc: Convert remaining uses " Joe Perches
2017-02-20 4:40 ` Michael Ellerman
2017-02-20 4:43 ` Joe Perches
2017-02-20 17:25 ` Geoff Levand
2017-02-17 7:11 ` [PATCH 07/35] sh: " Joe Perches
2017-02-17 7:11 ` [PATCH 08/35] sparc: Convert remaining use " Joe Perches
2017-02-17 8:39 ` Sam Ravnborg
2017-02-17 15:20 ` David Miller
2017-02-17 7:11 ` [PATCH 09/35] x86: Convert remaining uses " Joe Perches
2017-02-17 7:46 ` Pekka Paalanen
2017-02-17 8:06 ` Juergen Gross
2017-02-17 11:17 ` Thomas Gleixner
2017-02-17 14:07 ` Robert Richter
2017-02-17 15:01 ` Steven Rostedt
2017-02-21 1:12 ` Adan Hawthorn
2017-02-17 7:11 ` [PATCH 10/35] drivers/acpi: " Joe Perches
2017-02-17 7:11 ` [PATCH 11/35] block/drbd: " Joe Perches
2017-02-17 7:11 ` [PATCH 12/35] gdrom: " Joe Perches
2017-02-17 7:11 ` [PATCH 13/35] drivers/char: Convert remaining use " Joe Perches
2017-02-17 7:53 ` Amit Shah
2017-02-17 7:11 ` [PATCH 14/35] clocksource: " Joe Perches
2017-02-17 7:11 ` [PATCH 15/35] drivers/crypto: Convert remaining uses " Joe Perches
2017-02-17 7:11 ` [PATCH 16/35] fmc: Convert remaining use " Joe Perches
2017-02-17 7:11 ` Joe Perches [this message]
2017-02-17 14:22 ` [PATCH 17/35] drivers/gpu: Convert remaining uses " Christian König
2017-02-18 5:03 ` Edward O'Callaghan
2017-02-23 15:02 ` Alex Deucher
2017-02-17 7:11 ` [PATCH 18/35] drivers/ide: " Joe Perches
2017-02-17 15:20 ` David Miller
2017-02-17 7:11 ` [PATCH 19/35] drivers/input: " Joe Perches
2017-02-17 7:11 ` [PATCH 20/35] drivers/isdn: " Joe Perches
2017-02-17 8:49 ` Paul Bolle
2017-02-17 7:11 ` [PATCH 21/35] drivers/macintosh: " Joe Perches
2017-02-17 7:11 ` [PATCH 22/35] drivers/media: Convert remaining use " Joe Perches
2017-02-17 7:11 ` [PATCH 23/35] drivers/mfd: Convert remaining uses " Joe Perches
2017-03-14 14:04 ` Lee Jones
2017-03-14 17:17 ` Joe Perches
2017-03-15 12:23 ` Lee Jones
2017-03-15 14:17 ` Joe Perches
2017-03-23 10:52 ` Lee Jones
2017-02-17 7:11 ` [PATCH 24/35] drivers/mtd: " Joe Perches
2017-04-19 20:11 ` Brian Norris
2017-02-17 7:11 ` [PATCH 25/35] drivers/of: " Joe Perches
2017-02-17 7:11 ` [PATCH 26/35] drivers/oprofile: " Joe Perches
2017-02-17 14:07 ` Robert Richter
2017-02-17 7:11 ` [PATCH 27/35] drivers/platform: " Joe Perches
2017-02-17 7:45 ` Andy Shevchenko
2017-02-17 7:11 ` [PATCH 28/35] drivers/rapidio: Convert remaining use " Joe Perches
2017-02-17 7:11 ` [PATCH 29/35] drivers/scsi: " Joe Perches
2017-02-17 7:11 ` [PATCH 30/35] drivers/sh: " Joe Perches
2017-02-17 7:11 ` [PATCH 31/35] drivers/tty: Convert remaining uses " Joe Perches
2017-02-17 7:11 ` [PATCH 32/35] drivers/video: " Joe Perches
2017-03-21 15:17 ` Bartlomiej Zolnierkiewicz
2017-02-17 7:11 ` [PATCH 33/35] kernel/trace: " Joe Perches
2017-02-17 14:59 ` Steven Rostedt
2017-02-17 7:11 ` [PATCH 34/35] lib: " Joe Perches
2017-02-17 7:11 ` [PATCH 35/35] sound/soc: " Joe Perches
2017-02-17 20:28 ` Nicolin Chen
2017-02-17 23:48 ` Mark Brown
2017-02-17 23:57 ` Nicolin Chen
2017-02-18 0:20 ` Joe Perches
2017-02-20 19:06 ` Mark Brown
2017-02-17 12:27 ` [PATCH 00/35] treewide trivial patches converting " Rafael J. Wysocki
2017-02-23 15:28 ` Rob Herring
2017-02-23 17:18 ` Joe Perches
2017-02-23 17:41 ` Emil Velikov
2017-02-23 17:53 ` Joe Perches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=89288c2354690be744b72b27e39f317cb1c5310d.1487314667.git.joe@perches.com \
--to=joe@perches.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).