video/cmdline: Introduce CONFIG_VIDEO for video= parameter

Add CONFIG_VIDEO for common code in drivers/video/. Use the option to
select helpers for the video= parameter. Replaces CONFIG_VIDEO_CMDLINE.

Other common code in drivers/video/ can be moved behind CONFIG_VIDEO,
which will simplify the Kconfig rules.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20240118090721.7995-2-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 628f90ed8a9be02cda99a644ed8e0ca51b0f8bfb..da8750e1c8672db7110dcdc420b1ce4c082312f5 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -19,7 +19,7 @@ menuconfig DRM
 # gallium uses SYS_kcmp for os_same_file_description() to de-duplicate
 # device and dmabuf fd. Let's make sure that is available for our userspace.
        select KCMP
-       select VIDEO_CMDLINE
+       select VIDEO
        select VIDEO_NOMODESET
        help
          Kernel-level support for the Direct Rendering Infrastructure (DRI)

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index b694d7669d3200b148c5575a468f9464192114c0..253b129a82dc5868ad39471e5c21c0f759a1ec00 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -18,8 +18,9 @@ config STI_CORE
          STI refers to the HP "Standard Text Interface" which is a set of
          BIOS routines contained in a ROM chip in HP PA-RISC based machines.
 
-config VIDEO_CMDLINE
+config VIDEO
        bool
+       default n
 
 config VIDEO_NOMODESET
        bool

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 6bbc039508995ee9b027ab19571d9db53c75e6d9..287c198f0c82f17858c81afc69c6ff45770430b0 100644 (file)
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -3,7 +3,7 @@
 obj-$(CONFIG_APERTURE_HELPERS)    += aperture.o
 obj-$(CONFIG_STI_CORE)            += sticore.o
 obj-$(CONFIG_VGASTATE)            += vgastate.o
-obj-$(CONFIG_VIDEO_CMDLINE)       += cmdline.o
+obj-$(CONFIG_VIDEO)               += cmdline.o
 obj-$(CONFIG_VIDEO_NOMODESET)     += nomodeset.o
 obj-$(CONFIG_HDMI)                += hdmi.o
 

diff --git a/drivers/video/fbdev/core/Kconfig b/drivers/video/fbdev/core/Kconfig
index 21053bf00dc58cbe9e67d6780ccf66007e7b0817..db09fe87fcd4fe635f27a08f21b069bf76146632 100644 (file)
--- a/drivers/video/fbdev/core/Kconfig
+++ b/drivers/video/fbdev/core/Kconfig
@@ -4,7 +4,7 @@
 #
 
 config FB_CORE
-       select VIDEO_CMDLINE
+       select VIDEO
        tristate
 
 config FB_NOTIFY

diff --git a/include/video/cmdline.h b/include/video/cmdline.h
index 26b80cdaef7970f0acae91dc728ce67fadfa480d..77292d1d6173b29e46714fed38fc9b39186afc46 100644 (file)
--- a/include/video/cmdline.h
+++ b/include/video/cmdline.h
@@ -5,16 +5,9 @@
 
 #include <linux/types.h>
 
-#if defined(CONFIG_VIDEO_CMDLINE)
 const char *video_get_options(const char *name);
 
 /* exported for compatibility with fbdev; don't use in new code */
 bool __video_get_options(const char *name, const char **option, bool is_of);
-#else
-static inline const char *video_get_options(const char *name)
-{
-       return NULL;
-}
-#endif
 
 #endif