On Sat, Sep 5, 2015 at 5:17 AM, Lukas Wunner <lukas@xxxxxxxxx> 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 <lukas@xxxxxxxxx> Applied patches 13 and 14. Thanks, Alex > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c > index 3f7aaa4..1a6b239 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c > @@ -536,7 +536,7 @@ static bool amdgpu_atpx_detect(void) > > if (has_atpx && vga_count == 2) { > acpi_get_name(amdgpu_atpx_priv.atpx.handle, ACPI_FULL_PATHNAME, &buffer); > - printk(KERN_INFO "VGA switcheroo: detected switching method %s handle\n", > + printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n", > acpi_method_name); > amdgpu_atpx_priv.atpx_detected = true; > return true; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index 6ff6ae9..b1a08d9 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -1021,7 +1021,7 @@ static void amdgpu_check_arguments(struct amdgpu_device *adev) > * amdgpu_switcheroo_set_state - set switcheroo state > * > * @pdev: pci dev pointer > - * @state: vga switcheroo state > + * @state: vga_switcheroo state > * > * Callback for the switcheroo driver. Suspends or resumes the > * the asics before or after it is powered up using ACPI methods. > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > index 2236793..a60eb4b 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > @@ -488,7 +488,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file > * > * @dev: drm dev pointer > * > - * Switch vga switcheroo state after last close (all asics). > + * Switch vga_switcheroo state after last close (all asics). > */ > void amdgpu_driver_lastclose_kms(struct drm_device *dev) > { > -- > 1.8.5.2 (Apple Git-48) > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel