From: Javier Martinez Canillas <javierm@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: "Pekka Paalanen" <pekka.paalanen@collabora.com>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
dri-devel@lists.freedesktop.org,
"Peter Robinson" <pbrobinson@gmail.com>,
"Jani Nikula" <jani.nikula@intel.com>,
"Michel Dänzer" <michel@daenzer.net>,
"Javier Martinez Canillas" <javierm@redhat.com>
Subject: [PATCH v4 2/6] drm/vboxvideo: Drop CONFIG_VGA_CONSOLE guard to call vgacon_text_force()
Date: Mon, 8 Nov 2021 15:06:44 +0100 [thread overview]
Message-ID: <20211108140648.795268-3-javierm@redhat.com> (raw)
In-Reply-To: <20211108140648.795268-1-javierm@redhat.com>
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>
---
(no changes since v1)
drivers/gpu/drm/vboxvideo/vbox_drv.c | 2 --
1 file changed, 2 deletions(-)
diff --git drivers/gpu/drm/vboxvideo/vbox_drv.c drivers/gpu/drm/vboxvideo/vbox_drv.c
index a6c81af37345..fd7abb029c65 100644
--- drivers/gpu/drm/vboxvideo/vbox_drv.c
+++ 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;
--
2.33.1
next prev parent reply other threads:[~2021-11-08 14:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-08 14:06 [PATCH v4 0/6] Cleanups for the nomodeset kernel command line parameter logic Javier Martinez Canillas
2021-11-08 14:06 ` [PATCH v4 1/6] drm: Don't print messages if drivers are disabled due nomodeset Javier Martinez Canillas
2021-11-08 14:06 ` Javier Martinez Canillas [this message]
2021-11-08 14:06 ` [PATCH v4 3/6] drm: Move nomodeset kernel parameter to the DRM subsystem Javier Martinez Canillas
2021-11-08 14:06 ` [PATCH v4 4/6] drm: Decouple nomodeset from CONFIG_VGA_CONSOLE Javier Martinez Canillas
2021-11-08 14:06 ` [PATCH v4 5/6] Documentation/admin-guide: Document nomodeset kernel parameter Javier Martinez Canillas
2021-11-08 14:06 ` [PATCH v4 6/6] drm: Make the nomodeset message less sensational Javier Martinez Canillas
2021-11-08 14:17 ` [PATCH v4 0/6] Cleanups for the nomodeset kernel command line parameter logic Thomas Zimmermann
2021-11-12 8:56 ` Pekka Paalanen
2021-11-12 9:39 ` Javier Martinez Canillas
2021-11-12 10:09 ` Thomas Zimmermann
2021-11-12 10:22 ` Pekka Paalanen
2021-11-12 10:35 ` Javier Martinez Canillas
2021-11-12 10:37 ` Jani Nikula
2021-11-12 10:57 ` Thomas Zimmermann
2021-11-12 11:20 ` Javier Martinez Canillas
2021-11-12 11:23 ` Thomas Zimmermann
2021-11-12 12:10 ` Pekka Paalanen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211108140648.795268-3-javierm@redhat.com \
--to=javierm@redhat.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=michel@daenzer.net \
--cc=pbrobinson@gmail.com \
--cc=pekka.paalanen@collabora.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox