On Sat, Sep 05, 2015 at 11:22:39AM +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 <lukas@xxxxxxxxx> Applied to drm-misc, thanks. -Daniel > --- > Documentation/DocBook/drm.tmpl | 2 +- > drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- > include/linux/fb.h | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl > index 9ddf8c6..30401f9 100644 > --- a/Documentation/DocBook/drm.tmpl > +++ b/Documentation/DocBook/drm.tmpl > @@ -3646,7 +3646,7 @@ void (*postclose) (struct drm_device *, struct drm_file *);</synopsis> > plane properties to default value, so that a subsequent open of the > device will not inherit state from the previous user. It can also be > used to execute delayed power switching state changes, e.g. in > - conjunction with the vga-switcheroo infrastructure. Beyond that KMS > + conjunction with the vga_switcheroo infrastructure. Beyond that KMS > drivers should not do any further cleanup. Only legacy UMS drivers might > need to clean up device state so that the vga console or an independent > fbdev driver could take over. > diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c > index a5f9d8b..d685e23 100644 > --- a/drivers/gpu/drm/omapdrm/omap_drv.c > +++ b/drivers/gpu/drm/omapdrm/omap_drv.c > @@ -753,7 +753,7 @@ static void dev_lastclose(struct drm_device *dev) > { > int i; > > - /* we don't support vga-switcheroo.. so just make sure the fbdev > + /* we don't support vga_switcheroo.. so just make sure the fbdev > * mode is active > */ > struct omap_drm_private *priv = dev->dev_private; > diff --git a/include/linux/fb.h b/include/linux/fb.h > index 043f328..36da20a 100644 > --- a/include/linux/fb.h > +++ b/include/linux/fb.h > @@ -156,7 +156,7 @@ struct fb_cursor_user { > #define FB_EVENT_GET_REQ 0x0D > /* Unbind from the console if possible */ > #define FB_EVENT_FB_UNBIND 0x0E > -/* CONSOLE-SPECIFIC: remap all consoles to new fb - for vga switcheroo */ > +/* CONSOLE-SPECIFIC: remap all consoles to new fb - for vga_switcheroo */ > #define FB_EVENT_REMAP_ALL_CONSOLE 0x0F > /* A hardware display blank early change occured */ > #define FB_EARLY_EVENT_BLANK 0x10 > -- > 1.8.5.2 (Apple Git-48) > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel