From: Daniel Vetter <daniel@ffwll•ch>
To: Christoph Hellwig <hch@lst•de>
Cc: Petr Mladek <pmladek@suse•com>, Jiri Kosina <jikos@kernel•org>,
Andrew Donnellan <ajd@linux•ibm.com>,
linux-kbuild@vger•kernel.org, David Airlie <airlied@linux•ie>,
Masahiro Yamada <masahiroy@kernel•org>,
Josh Poimboeuf <jpoimboe@redhat•com>,
Maarten Lankhorst <maarten.lankhorst@linux•intel.com>,
linux-kernel@vger•kernel.org, Maxime Ripard <mripard@kernel•org>,
live-patching@vger•kernel.org,
Michal Marek <michal.lkml@markovi•net>,
Joe Lawrence <joe.lawrence@redhat•com>,
dri-devel@lists•freedesktop.org,
Thomas Zimmermann <tzimmermann@suse•de>,
Jessica Yu <jeyu@kernel•org>,
Frederic Barrat <fbarrat@linux•ibm.com>,
Daniel Vetter <daniel@ffwll•ch>, Miroslav Benes <mbenes@suse•cz>,
linuxppc-dev@lists•ozlabs.org
Subject: Re: [PATCH 02/13] drm: remove drm_fb_helper_modinit
Date: Wed, 3 Feb 2021 11:34:50 +0100 [thread overview]
Message-ID: <YBp8ShiKbQSPCcRx@phenom.ffwll.local> (raw)
In-Reply-To: <20210128181421.2279-3-hch@lst.de>
On Thu, Jan 28, 2021 at 07:14:10PM +0100, Christoph Hellwig wrote:
> 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, and skip the find_module check as a
> request_module is harmless if the module is already loaded (and not
> other caller has this find_module check either).
>
> Signed-off-by: Christoph Hellwig <hch@lst•de>
Hm I thought I've acked this one already somewhere for merging through
your tree.
Acked-by: Daniel Vetter <daniel.vetter@ffwll•ch>
> ---
> drivers/gpu/drm/drm_crtc_helper_internal.h | 10 ---------
> drivers/gpu/drm/drm_fb_helper.c | 21 ------------------
> drivers/gpu/drm/drm_kms_helper_common.c | 25 +++++++++++-----------
> 3 files changed, 12 insertions(+), 44 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 4b81195106875d..0b9f1ae1b7864c 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -2499,24 +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";
> - struct module *fbcon;
> -
> - mutex_lock(&module_mutex);
> - fbcon = find_module(name);
> - mutex_unlock(&module_mutex);
> -
> - if (!fbcon)
> - 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..f933da1656eb52 100644
> --- a/drivers/gpu/drm/drm_kms_helper_common.c
> +++ b/drivers/gpu/drm/drm_kms_helper_common.c
> @@ -64,19 +64,18 @@ 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))
> + request_module_nowait("fbcon");
> +
> + return drm_dp_aux_dev_init();
> }
>
> static void __exit drm_kms_helper_exit(void)
> --
> 2.29.2
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2021-02-03 10:36 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-28 18:14 module loader dead code removal and cleanups v2 Christoph Hellwig
2021-01-28 18:14 ` [PATCH 01/13] powerpc/powernv: remove get_cxl_module Christoph Hellwig
2021-01-28 18:14 ` [PATCH 02/13] drm: remove drm_fb_helper_modinit Christoph Hellwig
2021-02-03 10:34 ` Daniel Vetter [this message]
2021-02-03 10:49 ` Christoph Hellwig
2021-01-28 18:14 ` [PATCH 03/13] module: unexport find_module and module_mutex Christoph Hellwig
2021-01-29 15:16 ` Miroslav Benes
2021-01-28 18:14 ` [PATCH 04/13] module: use RCU to synchronize find_module Christoph Hellwig
2021-01-28 20:50 ` Thiago Jung Bauermann
2021-01-29 5:10 ` Christoph Hellwig
2021-01-29 21:29 ` Thiago Jung Bauermann
2021-01-29 10:04 ` Petr Mladek
2021-01-29 15:29 ` Miroslav Benes
2021-02-01 11:46 ` Christoph Hellwig
2021-02-01 12:10 ` Jessica Yu
2021-02-01 13:16 ` Miroslav Benes
2021-01-28 18:14 ` [PATCH 05/13] kallsyms: refactor {,module_}kallsyms_on_each_symbol Christoph Hellwig
2021-01-29 9:43 ` Petr Mladek
2021-02-01 11:47 ` Christoph Hellwig
2021-02-01 13:37 ` Miroslav Benes
2021-02-01 16:28 ` Christoph Hellwig
2021-02-02 10:45 ` Miroslav Benes
2021-02-01 14:02 ` Miroslav Benes
2021-01-28 18:14 ` [PATCH 06/13] kallsyms: only build {, module_}kallsyms_on_each_symbol when required Christoph Hellwig
2021-01-28 18:14 ` [PATCH 07/13] module: mark module_mutex static Christoph Hellwig
2021-01-28 18:14 ` [PATCH 08/13] module: remove each_symbol_in_section Christoph Hellwig
2021-01-28 18:14 ` [PATCH 09/13] module: merge each_symbol_section into find_symbol Christoph Hellwig
2021-01-28 18:14 ` [PATCH 10/13] module: pass struct find_symbol_args to find_symbol Christoph Hellwig
2021-01-28 18:14 ` [PATCH 11/13] module: move struct symsearch to module.c Christoph Hellwig
2021-01-28 18:14 ` [PATCH 12/13] module: remove EXPORT_SYMBOL_GPL_FUTURE Christoph Hellwig
2021-01-28 18:14 ` [PATCH 13/13] module: remove EXPORT_UNUSED_SYMBOL* Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2021-02-02 12:13 module loader dead code removal and cleanups v3 Christoph Hellwig
2021-02-02 12:13 ` [PATCH 02/13] drm: remove drm_fb_helper_modinit 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=YBp8ShiKbQSPCcRx@phenom.ffwll.local \
--to=daniel@ffwll$(echo .)ch \
--cc=airlied@linux$(echo .)ie \
--cc=ajd@linux$(echo .)ibm.com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=fbarrat@linux$(echo .)ibm.com \
--cc=hch@lst$(echo .)de \
--cc=jeyu@kernel$(echo .)org \
--cc=jikos@kernel$(echo .)org \
--cc=joe.lawrence@redhat$(echo .)com \
--cc=jpoimboe@redhat$(echo .)com \
--cc=linux-kbuild@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=live-patching@vger$(echo .)kernel.org \
--cc=maarten.lankhorst@linux$(echo .)intel.com \
--cc=masahiroy@kernel$(echo .)org \
--cc=mbenes@suse$(echo .)cz \
--cc=michal.lkml@markovi$(echo .)net \
--cc=mripard@kernel$(echo .)org \
--cc=pmladek@suse$(echo .)com \
--cc=tzimmermann@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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