From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753369AbbKBJIN (ORCPT ); Mon, 2 Nov 2015 04:08:13 -0500 Received: from mga02.intel.com ([134.134.136.20]:55765 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751771AbbKBJII (ORCPT ); Mon, 2 Nov 2015 04:08:08 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,234,1444719600"; d="scan'208";a="840956062" From: Jani Nikula To: Ioan-Adrian Ratiu , airlied@linux.ie, daniel.vetter@intel.com Cc: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: Re: [PATCH 1/1] drm/i915/dma: enforce pr_ consistency In-Reply-To: <1446246960-22620-1-git-send-email-adi@adirat.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1446246960-22620-1-git-send-email-adi@adirat.com> User-Agent: Notmuch/0.20.2+101~gb57168b (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Mon, 02 Nov 2015 11:12:01 +0200 Message-ID: <87611kpxy6.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 31 Oct 2015, Ioan-Adrian Ratiu wrote: > One branch of the if clause uses pr_info, the other pr_err; change > the 'false' branch to also use pr_info. This minor oversight has gone > unfixed since the initial vga_switcheroo implementation in 6a9ee8af. > > Signed-off-by: Ioan-Adrian Ratiu Pushed to drm-intel-next-queued, thanks for the patch. BR, Jani. > --- > drivers/gpu/drm/i915/i915_dma.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c > index 2336af9..b23f465 100644 > --- a/drivers/gpu/drm/i915/i915_dma.c > +++ b/drivers/gpu/drm/i915/i915_dma.c > @@ -338,7 +338,7 @@ static void i915_switcheroo_set_state(struct pci_dev *pdev, enum vga_switcheroo_ > i915_resume_switcheroo(dev); > dev->switch_power_state = DRM_SWITCH_POWER_ON; > } else { > - pr_err("switched off\n"); > + pr_info("switched off\n"); > dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; > i915_suspend_switcheroo(dev, pmm); > dev->switch_power_state = DRM_SWITCH_POWER_OFF; -- Jani Nikula, Intel Open Source Technology Center