From: Christoph Hellwig <hch@lst.de> To: Frederic Barrat <fbarrat@linux.ibm.com>, Andrew Donnellan <ajd@linux.ibm.com>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Maxime Ripard <mripard@kernel.org>, Thomas Zimmermann <tzimmermann@suse.de>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Jessica Yu <jeyu@kernel.org>, Josh Poimboeuf <jpoimboe@redhat.com>, Jiri Kosina <jikos@kernel.org>, Miroslav Benes <mbenes@suse.cz>, Petr Mladek <pmladek@suse.com>, Joe Lawrence <joe.lawrence@redhat.com> Cc: Masahiro Yamada <masahiroy@kernel.org>, Michal Marek <michal.lkml@markovi.net>, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, dri-devel@lists.freedesktop.org, live-patching@vger.kernel.org, linux-kbuild@vger.kernel.org Subject: [PATCH 08/13] drm: remove drm_fb_helper_modinit Date: Thu, 21 Jan 2021 08:49:54 +0100 [thread overview] Message-ID: <20210121074959.313333-9-hch@lst.de> (raw) In-Reply-To: <20210121074959.313333-1-hch@lst.de> drm_fb_helper_modinit has a lot of boilerplate for what is not very simple functionality. Just open code it in the only caller using IS_ENABLED and IS_MODULE. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/gpu/drm/drm_crtc_helper_internal.h | 10 --------- drivers/gpu/drm/drm_fb_helper.c | 16 ------------- drivers/gpu/drm/drm_kms_helper_common.c | 26 +++++++++++----------- 3 files changed, 13 insertions(+), 39 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc_helper_internal.h b/drivers/gpu/drm/drm_crtc_helper_internal.h index 25ce42e799952c..61e09f8a8d0ff0 100644 --- a/drivers/gpu/drm/drm_crtc_helper_internal.h +++ b/drivers/gpu/drm/drm_crtc_helper_internal.h @@ -32,16 +32,6 @@ #include <drm/drm_encoder.h> #include <drm/drm_modes.h> -/* drm_fb_helper.c */ -#ifdef CONFIG_DRM_FBDEV_EMULATION -int drm_fb_helper_modinit(void); -#else -static inline int drm_fb_helper_modinit(void) -{ - return 0; -} -#endif - /* drm_dp_aux_dev.c */ #ifdef CONFIG_DRM_DP_AUX_CHARDEV int drm_dp_aux_dev_init(void); diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index ce6d63ca75c32a..0b9f1ae1b7864c 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -2499,19 +2499,3 @@ void drm_fbdev_generic_setup(struct drm_device *dev, drm_client_register(&fb_helper->client); } EXPORT_SYMBOL(drm_fbdev_generic_setup); - -/* The Kconfig DRM_KMS_HELPER selects FRAMEBUFFER_CONSOLE (if !EXPERT) - * but the module doesn't depend on any fb console symbols. At least - * attempt to load fbcon to avoid leaving the system without a usable console. - */ -int __init drm_fb_helper_modinit(void) -{ -#if defined(CONFIG_FRAMEBUFFER_CONSOLE_MODULE) && !defined(CONFIG_EXPERT) - const char name[] = "fbcon"; - - if (!module_loaded(name)) - request_module_nowait(name); -#endif - return 0; -} -EXPORT_SYMBOL(drm_fb_helper_modinit); diff --git a/drivers/gpu/drm/drm_kms_helper_common.c b/drivers/gpu/drm/drm_kms_helper_common.c index 221a8528c9937a..b694a7da632eae 100644 --- a/drivers/gpu/drm/drm_kms_helper_common.c +++ b/drivers/gpu/drm/drm_kms_helper_common.c @@ -64,19 +64,19 @@ MODULE_PARM_DESC(edid_firmware, static int __init drm_kms_helper_init(void) { - int ret; - - /* Call init functions from specific kms helpers here */ - ret = drm_fb_helper_modinit(); - if (ret < 0) - goto out; - - ret = drm_dp_aux_dev_init(); - if (ret < 0) - goto out; - -out: - return ret; + /* + * The Kconfig DRM_KMS_HELPER selects FRAMEBUFFER_CONSOLE (if !EXPERT) + * but the module doesn't depend on any fb console symbols. At least + * attempt to load fbcon to avoid leaving the system without a usable + * console. + */ + if (IS_ENABLED(CONFIG_DRM_FBDEV_EMULATION) && + IS_MODULE(CONFIG_FRAMEBUFFER_CONSOLE) && + !IS_ENABLED(CONFIG_EXPERT) && + !module_loaded("fbcon")) + request_module_nowait("fbcon"); + + return drm_dp_aux_dev_init(); } static void __exit drm_kms_helper_exit(void) -- 2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Frederic Barrat <fbarrat@linux.ibm.com>, Andrew Donnellan <ajd@linux.ibm.com>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Maxime Ripard <mripard@kernel.org>, Thomas Zimmermann <tzimmermann@suse.de>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Jessica Yu <jeyu@kernel.org>, Josh Poimboeuf <jpoimboe@redhat.com>, Jiri Kosina <jikos@kernel.org>, Miroslav Benes <mbenes@suse.cz>, Petr Mladek <pmladek@suse.com>, Joe Lawrence <joe.lawrence@redhat.com> Cc: Michal Marek <michal.lkml@markovi.net>, linux-kbuild@vger.kernel.org, Masahiro Yamada <masahiroy@kernel.org>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, live-patching@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 08/13] drm: remove drm_fb_helper_modinit Date: Thu, 21 Jan 2021 08:49:54 +0100 [thread overview] Message-ID: <20210121074959.313333-9-hch@lst.de> (raw) In-Reply-To: <20210121074959.313333-1-hch@lst.de> drm_fb_helper_modinit has a lot of boilerplate for what is not very simple functionality. Just open code it in the only caller using IS_ENABLED and IS_MODULE. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/gpu/drm/drm_crtc_helper_internal.h | 10 --------- drivers/gpu/drm/drm_fb_helper.c | 16 ------------- drivers/gpu/drm/drm_kms_helper_common.c | 26 +++++++++++----------- 3 files changed, 13 insertions(+), 39 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc_helper_internal.h b/drivers/gpu/drm/drm_crtc_helper_internal.h index 25ce42e799952c..61e09f8a8d0ff0 100644 --- a/drivers/gpu/drm/drm_crtc_helper_internal.h +++ b/drivers/gpu/drm/drm_crtc_helper_internal.h @@ -32,16 +32,6 @@ #include <drm/drm_encoder.h> #include <drm/drm_modes.h> -/* drm_fb_helper.c */ -#ifdef CONFIG_DRM_FBDEV_EMULATION -int drm_fb_helper_modinit(void); -#else -static inline int drm_fb_helper_modinit(void) -{ - return 0; -} -#endif - /* drm_dp_aux_dev.c */ #ifdef CONFIG_DRM_DP_AUX_CHARDEV int drm_dp_aux_dev_init(void); diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index ce6d63ca75c32a..0b9f1ae1b7864c 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -2499,19 +2499,3 @@ void drm_fbdev_generic_setup(struct drm_device *dev, drm_client_register(&fb_helper->client); } EXPORT_SYMBOL(drm_fbdev_generic_setup); - -/* The Kconfig DRM_KMS_HELPER selects FRAMEBUFFER_CONSOLE (if !EXPERT) - * but the module doesn't depend on any fb console symbols. At least - * attempt to load fbcon to avoid leaving the system without a usable console. - */ -int __init drm_fb_helper_modinit(void) -{ -#if defined(CONFIG_FRAMEBUFFER_CONSOLE_MODULE) && !defined(CONFIG_EXPERT) - const char name[] = "fbcon"; - - if (!module_loaded(name)) - request_module_nowait(name); -#endif - return 0; -} -EXPORT_SYMBOL(drm_fb_helper_modinit); diff --git a/drivers/gpu/drm/drm_kms_helper_common.c b/drivers/gpu/drm/drm_kms_helper_common.c index 221a8528c9937a..b694a7da632eae 100644 --- a/drivers/gpu/drm/drm_kms_helper_common.c +++ b/drivers/gpu/drm/drm_kms_helper_common.c @@ -64,19 +64,19 @@ MODULE_PARM_DESC(edid_firmware, static int __init drm_kms_helper_init(void) { - int ret; - - /* Call init functions from specific kms helpers here */ - ret = drm_fb_helper_modinit(); - if (ret < 0) - goto out; - - ret = drm_dp_aux_dev_init(); - if (ret < 0) - goto out; - -out: - return ret; + /* + * The Kconfig DRM_KMS_HELPER selects FRAMEBUFFER_CONSOLE (if !EXPERT) + * but the module doesn't depend on any fb console symbols. At least + * attempt to load fbcon to avoid leaving the system without a usable + * console. + */ + if (IS_ENABLED(CONFIG_DRM_FBDEV_EMULATION) && + IS_MODULE(CONFIG_FRAMEBUFFER_CONSOLE) && + !IS_ENABLED(CONFIG_EXPERT) && + !module_loaded("fbcon")) + request_module_nowait("fbcon"); + + return drm_dp_aux_dev_init(); } static void __exit drm_kms_helper_exit(void) -- 2.29.2
next prev parent reply other threads:[~2021-01-21 8:22 UTC|newest] Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-21 7:49 module loader dead code removal and cleanusp Christoph Hellwig 2021-01-21 7:49 ` Christoph Hellwig 2021-01-21 7:49 ` [PATCH 01/13] powerpc/powernv: remove get_cxl_module Christoph Hellwig 2021-01-21 7:49 ` Christoph Hellwig 2021-01-21 9:09 ` Andrew Donnellan 2021-01-21 9:09 ` Andrew Donnellan 2021-01-21 9:09 ` Andrew Donnellan 2021-01-21 7:49 ` [PATCH 02/13] module: add a module_loaded helper Christoph Hellwig 2021-01-21 7:49 ` Christoph Hellwig 2021-01-21 9:59 ` Christophe Leroy 2021-01-21 10:13 ` David Laight 2021-01-21 10:17 ` Christophe Leroy 2021-01-21 10:00 ` Christophe Leroy 2021-01-21 10:00 ` Christophe Leroy 2021-01-21 17:11 ` Christoph Hellwig 2021-01-21 17:11 ` Christoph Hellwig 2021-01-21 17:44 ` David Laight 2021-01-21 17:44 ` David Laight 2021-01-21 17:44 ` David Laight 2021-01-21 7:49 ` [PATCH 03/13] livepatch: refactor klp_init_object Christoph Hellwig 2021-01-21 7:49 ` Christoph Hellwig 2021-01-27 12:58 ` Petr Mladek 2021-01-27 12:58 ` Petr Mladek 2021-01-27 12:58 ` Petr Mladek 2021-01-28 16:22 ` Christoph Hellwig 2021-01-28 16:22 ` Christoph Hellwig 2021-01-28 16:24 ` Christoph Hellwig 2021-01-28 16:24 ` Christoph Hellwig 2021-01-21 7:49 ` [PATCH 04/13] livepatch: move klp_find_object_module to module.c Christoph Hellwig 2021-01-21 7:49 ` Christoph Hellwig 2021-01-21 21:45 ` Josh Poimboeuf 2021-01-21 21:45 ` Josh Poimboeuf 2021-01-21 21:45 ` Josh Poimboeuf 2021-01-26 14:25 ` Jessica Yu 2021-01-26 14:25 ` Jessica Yu 2021-01-26 14:25 ` Jessica Yu 2021-01-27 11:55 ` Petr Mladek 2021-01-27 11:55 ` Petr Mladek 2021-01-27 11:55 ` Petr Mladek 2021-01-21 7:49 ` [PATCH 05/13] kallsyms: refactor {,module_}kallsyms_on_each_symbol Christoph Hellwig 2021-01-21 7:49 ` Christoph Hellwig 2021-01-21 7:49 ` [PATCH 06/13] kallsyms: only build {,module_}kallsyms_on_each_symbol when required Christoph Hellwig 2021-01-21 7:49 ` [PATCH 06/13] kallsyms: only build {, module_}kallsyms_on_each_symbol " Christoph Hellwig 2021-01-21 7:49 ` [PATCH 07/13] module: mark module_mutex static Christoph Hellwig 2021-01-21 7:49 ` Christoph Hellwig 2021-01-21 7:49 ` Christoph Hellwig [this message] 2021-01-21 7:49 ` [PATCH 08/13] drm: remove drm_fb_helper_modinit Christoph Hellwig 2021-01-21 8:25 ` Daniel Vetter 2021-01-21 8:25 ` Daniel Vetter 2021-01-21 8:25 ` Daniel Vetter 2021-01-21 8:28 ` Christoph Hellwig 2021-01-21 8:28 ` Christoph Hellwig 2021-01-21 8:39 ` Daniel Vetter 2021-01-21 8:39 ` Daniel Vetter 2021-01-21 8:39 ` Daniel Vetter 2021-01-21 7:49 ` [PATCH 09/13] module: remove each_symbol_in_section Christoph Hellwig 2021-01-21 7:49 ` Christoph Hellwig 2021-01-21 7:49 ` [PATCH 10/13] module: merge each_symbol_section into find_symbol Christoph Hellwig 2021-01-21 7:49 ` Christoph Hellwig 2021-01-21 7:49 ` [PATCH 11/13] module: pass struct find_symbol_args to find_symbol Christoph Hellwig 2021-01-21 7:49 ` Christoph Hellwig 2021-01-21 7:49 ` [PATCH 12/13] module: remove EXPORT_SYMBOL_GPL_FUTURE Christoph Hellwig 2021-01-21 7:49 ` Christoph Hellwig 2021-01-21 7:49 ` [PATCH 13/13] module: remove EXPORY_UNUSED_SYMBOL* Christoph Hellwig 2021-01-21 7:49 ` Christoph Hellwig 2021-01-27 13:49 ` Jessica Yu 2021-01-27 13:49 ` Jessica Yu 2021-01-27 13:49 ` Jessica Yu 2021-01-28 16:09 ` Christoph Hellwig 2021-01-28 16:09 ` Christoph Hellwig
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=20210121074959.313333-9-hch@lst.de \ --to=hch@lst.de \ --cc=airlied@linux.ie \ --cc=ajd@linux.ibm.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=fbarrat@linux.ibm.com \ --cc=jeyu@kernel.org \ --cc=jikos@kernel.org \ --cc=joe.lawrence@redhat.com \ --cc=jpoimboe@redhat.com \ --cc=linux-kbuild@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=live-patching@vger.kernel.org \ --cc=maarten.lankhorst@linux.intel.com \ --cc=masahiroy@kernel.org \ --cc=mbenes@suse.cz \ --cc=michal.lkml@markovi.net \ --cc=mripard@kernel.org \ --cc=pmladek@suse.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.