From: "Ricardo B. Marliere" <ricardo@marliere.net>
To: "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Hans de Goede" <hdegoede@redhat.com>,
"Helge Deller" <deller@gmx.de>,
"Sumit Semwal" <sumit.semwal@linaro.org>,
"Benjamin Gaignard" <benjamin.gaignard@collabora.com>,
"Brian Starkey" <Brian.Starkey@arm.com>,
"John Stultz" <jstultz@google.com>,
"T.J. Mercier" <tjmercier@google.com>,
"Christian König" <christian.koenig@amd.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
linux-fbdev@vger.kernel.org, linux-media@vger.kernel.org,
linaro-mm-sig@lists.linaro.org,
"Ricardo B. Marliere" <ricardo@marliere.net>
Subject: [PATCH RESEND drm-misc 3/4] drm/fbdev/core: make fb_class constant
Date: Tue, 05 Mar 2024 08:34:12 -0300 [thread overview]
Message-ID: <20240305-class_cleanup-drm-v1-3-94f82740525a@marliere.net> (raw)
In-Reply-To: <20240305-class_cleanup-drm-v1-0-94f82740525a@marliere.net>
Since commit 43a7206b0963 ("driver core: class: make class_register() take
a const *"), the driver core allows for struct class to be in read-only
memory, so move the fb_class structure to be declared at build time placing
it into read-only memory, instead of having to be dynamically allocated at
boot time.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ricardo B. Marliere <ricardo@marliere.net>
---
drivers/video/fbdev/core/fb_internal.h | 2 +-
drivers/video/fbdev/core/fbcon.c | 4 ++--
drivers/video/fbdev/core/fbmem.c | 17 ++++++++---------
drivers/video/fbdev/core/fbsysfs.c | 4 ++--
4 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/drivers/video/fbdev/core/fb_internal.h b/drivers/video/fbdev/core/fb_internal.h
index 613832d335fe..f1c0f1386675 100644
--- a/drivers/video/fbdev/core/fb_internal.h
+++ b/drivers/video/fbdev/core/fb_internal.h
@@ -38,7 +38,7 @@ static inline int fb_show_logo(struct fb_info *info, int rotate)
#endif /* CONFIG_LOGO */
/* fbmem.c */
-extern struct class *fb_class;
+extern const struct class fb_class;
extern struct mutex registration_lock;
extern struct fb_info *registered_fb[FB_MAX];
extern int num_registered_fb;
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index 1183e7a871f8..4d87a6ebdbdf 100644
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -3380,7 +3380,7 @@ void __init fb_console_init(void)
int i;
console_lock();
- fbcon_device = device_create(fb_class, NULL, MKDEV(0, 0), NULL,
+ fbcon_device = device_create(&fb_class, NULL, MKDEV(0, 0), NULL,
"fbcon");
if (IS_ERR(fbcon_device)) {
@@ -3425,7 +3425,7 @@ void __exit fb_console_exit(void)
console_lock();
fbcon_deinit_device();
- device_destroy(fb_class, MKDEV(0, 0));
+ device_destroy(&fb_class, MKDEV(0, 0));
do_unregister_con_driver(&fb_con);
console_unlock();
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index 48287366e0d4..d868194499fb 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -26,7 +26,9 @@
#define FBPIXMAPSIZE (1024 * 8)
-struct class *fb_class;
+const struct class fb_class = {
+ .name = "graphics",
+};
DEFINE_MUTEX(registration_lock);
struct fb_info *registered_fb[FB_MAX] __read_mostly;
@@ -571,11 +573,10 @@ static int __init fbmem_init(void)
{
int ret;
- fb_class = class_create("graphics");
- if (IS_ERR(fb_class)) {
- ret = PTR_ERR(fb_class);
+ ret = class_register(&fb_class);
+ if (ret) {
pr_err("Unable to create fb class; errno = %d\n", ret);
- goto err_fb_class;
+ return ret;
}
ret = fb_init_procfs();
@@ -593,9 +594,7 @@ static int __init fbmem_init(void)
err_fb_cleanup_procfs:
fb_cleanup_procfs();
err_class_destroy:
- class_destroy(fb_class);
-err_fb_class:
- fb_class = NULL;
+ class_unregister(&fb_class);
return ret;
}
@@ -605,7 +604,7 @@ static void __exit fbmem_exit(void)
fb_console_exit();
fb_unregister_chrdev();
fb_cleanup_procfs();
- class_destroy(fb_class);
+ class_unregister(&fb_class);
}
module_init(fbmem_init);
diff --git a/drivers/video/fbdev/core/fbsysfs.c b/drivers/video/fbdev/core/fbsysfs.c
index 1b3c9958ef5c..aac013dfe06a 100644
--- a/drivers/video/fbdev/core/fbsysfs.c
+++ b/drivers/video/fbdev/core/fbsysfs.c
@@ -476,7 +476,7 @@ int fb_device_create(struct fb_info *fb_info)
dev_t devt = MKDEV(FB_MAJOR, node);
int ret;
- fb_info->dev = device_create(fb_class, fb_info->device, devt, NULL, "fb%d", node);
+ fb_info->dev = device_create(&fb_class, fb_info->device, devt, NULL, "fb%d", node);
if (IS_ERR(fb_info->dev)) {
/* Not fatal */
ret = PTR_ERR(fb_info->dev);
@@ -497,6 +497,6 @@ void fb_device_destroy(struct fb_info *fb_info)
return;
fb_cleanup_device(fb_info);
- device_destroy(fb_class, devt);
+ device_destroy(&fb_class, devt);
fb_info->dev = NULL;
}
--
2.43.0
next prev parent reply other threads:[~2024-03-05 11:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-05 11:34 [PATCH RESEND drm-misc 0/4] drm: constify struct class usage Ricardo B. Marliere
2024-03-05 11:34 ` [PATCH RESEND drm-misc 1/4] drm/dp: make drm_dp_aux_dev_class constant Ricardo B. Marliere
2024-03-05 11:34 ` [PATCH RESEND drm-misc 2/4] drm/sysfs: make drm_class constant Ricardo B. Marliere
2024-03-05 11:34 ` Ricardo B. Marliere [this message]
2024-03-05 11:34 ` [PATCH RESEND drm-misc 4/4] dma-buf: heaps: make dma_heap_class constant Ricardo B. Marliere
2024-03-05 17:07 ` T.J. Mercier
2024-03-05 18:02 ` Ricardo B. Marliere
2024-03-05 18:36 ` T.J. Mercier
2024-03-07 7:37 ` Sumit Semwal
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=20240305-class_cleanup-drm-v1-3-94f82740525a@marliere.net \
--to=ricardo@marliere.net \
--cc=Brian.Starkey@arm.com \
--cc=airlied@gmail.com \
--cc=benjamin.gaignard@collabora.com \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=deller@gmx.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=jstultz@google.com \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=sumit.semwal@linaro.org \
--cc=tjmercier@google.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).