summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javierm@redhat.com>2021-11-12 16:32:26 +0300
committerJavier Martinez Canillas <javierm@redhat.com>2021-11-27 15:52:18 +0300
commitd76f25d66ec83a8166f0c0be79bbb039d66062d0 (patch)
tree0cfe7a142b0b0b1e0c592030f35e968e5e35160d /drivers
parent35f7775f81bf8147b5b8b11958e15c0cc364b7c0 (diff)
downloadlinux-d76f25d66ec83a8166f0c0be79bbb039d66062d0.tar.xz
drm/vboxvideo: Drop CONFIG_VGA_CONSOLE guard to call vgacon_text_force()
It is already handled by the console.h macro since a stub inline function is defined for vgacon_text_force() if CONFIG_VGA_CONSOLE is not set. There's no need to have ifdefery in the driver when calling the function. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> Acked-by: Jani Nikula <jani.nikula@intel.com> Acked-by: Pekka Paalanen <pekka.paalanen@collabora.com> Link: https://patchwork.freedesktop.org/patch/msgid/20211112133230.1595307-3-javierm@redhat.com
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/vboxvideo/vbox_drv.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vboxvideo/vbox_drv.c b/drivers/gpu/drm/vboxvideo/vbox_drv.c
index a6c81af37345..fd7abb029c65 100644
--- a/drivers/gpu/drm/vboxvideo/vbox_drv.c
+++ b/drivers/gpu/drm/vboxvideo/vbox_drv.c
@@ -193,10 +193,8 @@ static const struct drm_driver driver = {
static int __init vbox_init(void)
{
-#ifdef CONFIG_VGA_CONSOLE
if (vgacon_text_force() && vbox_modeset == -1)
return -EINVAL;
-#endif
if (vbox_modeset == 0)
return -EINVAL;