aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2010-07-28 17:42:56 -0400
committerMatthew Garrett <mjg@redhat.com>2010-08-03 11:55:15 -0400
commit1a14703d6b20010401ca273ac1f07bff7992aa2c (patch)
tree3c4243192bbe94270fd36a58c07de9a00c04d40f
parent5aa06930fbcfcb6b03fcb18b753122b10ac47a87 (diff)
ips driver: make it less chatty
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>
-rw-r--r--drivers/platform/x86/intel_ips.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
index 03448224aedb..afe82e50dfea 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)
607 spin_unlock_irqrestore(&ips->turbo_status_lock, flags); 607 spin_unlock_irqrestore(&ips->turbo_status_lock, flags);
608 608
609 if (ret) 609 if (ret)
610 dev_warn(&ips->dev->dev, 610 dev_info(&ips->dev->dev,
611 "MCP power or thermal limit exceeded\n"); 611 "MCP power or thermal limit exceeded\n");
612 612
613 return ret; 613 return ret;
@@ -635,7 +635,7 @@ static bool cpu_exceeded(struct ips_driver *ips, int cpu)
635 spin_unlock_irqrestore(&ips->turbo_status_lock, flags); 635 spin_unlock_irqrestore(&ips->turbo_status_lock, flags);
636 636
637 if (ret) 637 if (ret)
638 dev_warn(&ips->dev->dev, 638 dev_info(&ips->dev->dev,
639 "CPU power or thermal limit exceeded\n"); 639 "CPU power or thermal limit exceeded\n");
640 640
641 return ret; 641 return ret;