From patchwork Wed Aug 18 01:27:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 61980 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 14529B70D8 for ; Wed, 18 Aug 2010 11:27:37 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OlXRE-00053b-Ow; Wed, 18 Aug 2010 02:27:32 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OlXRD-00052b-7W for kernel-team@lists.ubuntu.com; Wed, 18 Aug 2010 02:27:31 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OlXRD-0006P9-58 for ; Wed, 18 Aug 2010 02:27:31 +0100 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=localhost) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1OlXRC-0001tF-O0 for kernel-team@lists.ubuntu.com; Wed, 18 Aug 2010 02:27:31 +0100 From: leann.ogasawara@canonical.com To: kernel-team@lists.ubuntu.com Subject: [PATCH 5/6] ips driver: make it less chatty Date: Tue, 17 Aug 2010 18:27:09 -0700 Message-Id: <21d119b60be614f960cf8586f50fe7b53f9fde24.1282089274.git.leann.ogasawara@canonical.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Jesse Barnes 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 Signed-off-by: Matthew Garrett (cherry picked from commit 1a14703d6b20010401ca273ac1f07bff7992aa2c) Signed-off-by: Leann Ogasawara --- drivers/platform/x86/intel_ips.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) 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;