| Message ID | 20230629121952.10559-3-tzimmermann@suse.de (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | arch,fbdev: Move screen_info into arch/ | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/tree_selection | fail | Failed to apply to next/pending-fixes, riscv/for-next or riscv/master |
Thomas Zimmermann <tzimmermann@suse.de> writes: > Sm712fb's dependency on <linux/screen_info.h> is artificial in that > it only uses struct screen_info for its internals. Replace the use of > struct screen_info with a custom data structure and remove the include > of <linux/screen_info.h>. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com> > Cc: Teddy Wang <teddy.wang@siliconmotion.com> > Cc: Helge Deller <deller@gmx.de> > --- Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
diff --git a/drivers/video/fbdev/sm712fb.c b/drivers/video/fbdev/sm712fb.c index b7ad3c644e138..f929091da4e77 100644 --- a/drivers/video/fbdev/sm712fb.c +++ b/drivers/video/fbdev/sm712fb.c @@ -27,12 +27,17 @@ #include <linux/uaccess.h> #include <linux/module.h> #include <linux/console.h> -#include <linux/screen_info.h> #include <linux/pm.h> #include "sm712.h" +struct smtcfb_screen_info { + u16 lfb_width; + u16 lfb_height; + u16 lfb_depth; +}; + /* * Private structure */ @@ -829,7 +834,7 @@ static const struct modeinit vgamode[] = { }, }; -static struct screen_info smtc_scr_info; +static struct smtcfb_screen_info smtc_scr_info; static char *mode_option;
Sm712fb's dependency on <linux/screen_info.h> is artificial in that it only uses struct screen_info for its internals. Replace the use of struct screen_info with a custom data structure and remove the include of <linux/screen_info.h>. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com> Cc: Teddy Wang <teddy.wang@siliconmotion.com> Cc: Helge Deller <deller@gmx.de> --- drivers/video/fbdev/sm712fb.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)