public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] drm/i915/dma: enforce pr_<loglevel> consistency
@ 2015-10-30 23:16 Ioan-Adrian Ratiu
  2015-11-02  9:12 ` Jani Nikula
  0 siblings, 1 reply; 2+ messages in thread
From: Ioan-Adrian Ratiu @ 2015-10-30 23:16 UTC (permalink / raw)
  To: airlied, daniel.vetter; +Cc: intel-gfx, dri-devel, linux-kernel

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 <adi@adirat.com>
---
 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;
-- 
2.6.2


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/1] drm/i915/dma: enforce pr_<loglevel> consistency
  2015-10-30 23:16 [PATCH 1/1] drm/i915/dma: enforce pr_<loglevel> consistency Ioan-Adrian Ratiu
@ 2015-11-02  9:12 ` Jani Nikula
  0 siblings, 0 replies; 2+ messages in thread
From: Jani Nikula @ 2015-11-02  9:12 UTC (permalink / raw)
  To: Ioan-Adrian Ratiu, airlied, daniel.vetter
  Cc: intel-gfx, linux-kernel, dri-devel

On Sat, 31 Oct 2015, Ioan-Adrian Ratiu <adi@adirat.com> 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 <adi@adirat.com>

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-11-02  9:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-30 23:16 [PATCH 1/1] drm/i915/dma: enforce pr_<loglevel> consistency Ioan-Adrian Ratiu
2015-11-02  9:12 ` Jani Nikula

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox