Skip to content

Commit

Permalink
fbdev/core: Unexport logo helpers
Browse files Browse the repository at this point in the history
The interfaces for the fbdev logo are not used outside of the fbdev
module. Hence declare the fbdev logo functions in the internal header
file and remove their symbol exports. Only build the functions if
CONFIG_LOGO has been selected.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230907085408.9354-5-tzimmermann@suse.de
  • Loading branch information
Thomas Zimmermann committed Sep 11, 2023
1 parent 58d2ef9 commit fa671e4
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 10 deletions.
16 changes: 16 additions & 0 deletions drivers/video/fbdev/core/fb_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,22 @@ static inline void fb_unregister_chrdev(void)
#endif

/* fbmem.c */
#if defined(CONFIG_LOGO)
extern bool fb_center_logo;
extern int fb_logo_count;
int fb_prepare_logo(struct fb_info *fb_info, int rotate);
int fb_show_logo(struct fb_info *fb_info, int rotate);
#else
static inline int fb_prepare_logo(struct fb_info *info, int rotate)
{
return 0;
}
static inline int fb_show_logo(struct fb_info *info, int rotate)
{
return 0;
}
#endif /* CONFIG_LOGO */

extern struct class *fb_class;
extern struct mutex registration_lock;
extern struct fb_info *registered_fb[FB_MAX];
Expand Down
5 changes: 0 additions & 5 deletions drivers/video/fbdev/core/fbmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -696,12 +696,7 @@ int fb_show_logo(struct fb_info *info, int rotate)

return y;
}
#else
int fb_prepare_logo(struct fb_info *info, int rotate) { return 0; }
int fb_show_logo(struct fb_info *info, int rotate) { return 0; }
#endif /* CONFIG_LOGO */
EXPORT_SYMBOL(fb_prepare_logo);
EXPORT_SYMBOL(fb_show_logo);

int
fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)
Expand Down
5 changes: 0 additions & 5 deletions include/linux/fb.h
Original file line number Diff line number Diff line change
Expand Up @@ -591,8 +591,6 @@ extern ssize_t fb_sys_write(struct fb_info *info, const char __user *buf,
/* drivers/video/fbmem.c */
extern int register_framebuffer(struct fb_info *fb_info);
extern void unregister_framebuffer(struct fb_info *fb_info);
extern int fb_prepare_logo(struct fb_info *fb_info, int rotate);
extern int fb_show_logo(struct fb_info *fb_info, int rotate);
extern char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size);
extern void fb_pad_unaligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 idx,
u32 height, u32 shift_high, u32 shift_low, u32 mod);
Expand All @@ -603,9 +601,6 @@ extern int fb_get_color_depth(struct fb_var_screeninfo *var,
extern int fb_get_options(const char *name, char **option);
extern int fb_new_modelist(struct fb_info *info);

extern bool fb_center_logo;
extern int fb_logo_count;

static inline void lock_fb_info(struct fb_info *info)
{
mutex_lock(&info->lock);
Expand Down

0 comments on commit fa671e4

Please sign in to comment.