Patchwork [5/6] ips driver: make it less chatty

login
register
mail settings
Submitter Leann Ogasawara
Date Aug. 18, 2010, 1:27 a.m.
Message ID <21d119b60be614f960cf8586f50fe7b53f9fde24.1282089274.git.leann.ogasawara@canonical.com>
Download mbox | patch
Permalink /patch/61980/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Leann Ogasawara - Aug. 18, 2010, 1:27 a.m.
From: Jesse Barnes <jbarnes@virtuousgeek.org>

BugLink: http://bugs.launchpad.net/bugs/601057

We don't need a dev_warn when we exceed a thermal or power limit as
we'll handle it appropriately by clamping down on the CPU, GPU or both
as needed.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 1a14703d6b20010401ca273ac1f07bff7992aa2c)

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 drivers/platform/x86/intel_ips.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
index 0344822..afe82e5 100644
--- a/drivers/platform/x86/intel_ips.c
+++ b/drivers/platform/x86/intel_ips.c
@@ -607,7 +607,7 @@  static bool mcp_exceeded(struct ips_driver *ips)
 	spin_unlock_irqrestore(&ips->turbo_status_lock, flags);
 
 	if (ret)
-		dev_warn(&ips->dev->dev,
+		dev_info(&ips->dev->dev,
 			 "MCP power or thermal limit exceeded\n");
 
 	return ret;
@@ -635,7 +635,7 @@  static bool cpu_exceeded(struct ips_driver *ips, int cpu)
 	spin_unlock_irqrestore(&ips->turbo_status_lock, flags);
 
 	if (ret)
-		dev_warn(&ips->dev->dev,
+		dev_info(&ips->dev->dev,
 			 "CPU power or thermal limit exceeded\n");
 
 	return ret;