[PATCH 11/15] drm/i915: Spell vga_switcheroo consistently

2015-09-22 Thread Daniel Vetter
On Fri, Sep 04, 2015 at 09:06:15PM +0200, Lukas Wunner wrote:
> Currently everyone and their dog has their own favourite spelling
> for vga_switcheroo. This makes it hard to grep dmesg for log entries
> relating to vga_switcheroo. It also makes it hard to find related
> source files in the tree.
> 
> vga_switcheroo.c uses pr_fmt "vga_switcheroo". Use that everywhere.
> 
> Signed-off-by: Lukas Wunner 

Queued for -next, thanks for the patch.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_acpi.c  | 2 +-
>  drivers/gpu/drm/i915/intel_panel.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_acpi.c 
> b/drivers/gpu/drm/i915/intel_acpi.c
> index d96eee1..8b13b9d 100644
> --- a/drivers/gpu/drm/i915/intel_acpi.c
> +++ b/drivers/gpu/drm/i915/intel_acpi.c
> @@ -146,7 +146,7 @@ static bool intel_dsm_detect(void)
>  
>   if (vga_count == 2 && has_dsm) {
>   acpi_get_name(intel_dsm_priv.dhandle, ACPI_FULL_PATHNAME, 
> );
> - DRM_DEBUG_DRIVER("VGA switcheroo: detected DSM switching method 
> %s handle\n",
> + DRM_DEBUG_DRIVER("vga_switcheroo: detected DSM switching method 
> %s handle\n",
>acpi_method_name);
>   return true;
>   }
> diff --git a/drivers/gpu/drm/i915/intel_panel.c 
> b/drivers/gpu/drm/i915/intel_panel.c
> index e2ab3f6..04f7d8e 100644
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -809,7 +809,7 @@ void intel_panel_disable_backlight(struct intel_connector 
> *connector)
>   return;
>  
>   /*
> -  * Do not disable backlight on the vgaswitcheroo path. When switching
> +  * Do not disable backlight on the vga_switcheroo path. When switching
>* away from i915, the other client may depend on i915 to handle the
>* backlight. This will leave the backlight on unnecessarily when
>* another client is not activated.
> -- 
> 1.8.5.2 (Apple Git-48)
> 
> ___
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


[PATCH 11/15] drm/i915: Spell vga_switcheroo consistently

2015-09-04 Thread Lukas Wunner
Currently everyone and their dog has their own favourite spelling
for vga_switcheroo. This makes it hard to grep dmesg for log entries
relating to vga_switcheroo. It also makes it hard to find related
source files in the tree.

vga_switcheroo.c uses pr_fmt "vga_switcheroo". Use that everywhere.

Signed-off-by: Lukas Wunner 
---
 drivers/gpu/drm/i915/intel_acpi.c  | 2 +-
 drivers/gpu/drm/i915/intel_panel.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_acpi.c 
b/drivers/gpu/drm/i915/intel_acpi.c
index d96eee1..8b13b9d 100644
--- a/drivers/gpu/drm/i915/intel_acpi.c
+++ b/drivers/gpu/drm/i915/intel_acpi.c
@@ -146,7 +146,7 @@ static bool intel_dsm_detect(void)

if (vga_count == 2 && has_dsm) {
acpi_get_name(intel_dsm_priv.dhandle, ACPI_FULL_PATHNAME, 
);
-   DRM_DEBUG_DRIVER("VGA switcheroo: detected DSM switching method 
%s handle\n",
+   DRM_DEBUG_DRIVER("vga_switcheroo: detected DSM switching method 
%s handle\n",
 acpi_method_name);
return true;
}
diff --git a/drivers/gpu/drm/i915/intel_panel.c 
b/drivers/gpu/drm/i915/intel_panel.c
index e2ab3f6..04f7d8e 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -809,7 +809,7 @@ void intel_panel_disable_backlight(struct intel_connector 
*connector)
return;

/*
-* Do not disable backlight on the vgaswitcheroo path. When switching
+* Do not disable backlight on the vga_switcheroo path. When switching
 * away from i915, the other client may depend on i915 to handle the
 * backlight. This will leave the backlight on unnecessarily when
 * another client is not activated.
-- 
1.8.5.2 (Apple Git-48)