diff mbox series

fbdev: Update fbdev source file paths

Message ID 20230829200253.1473891-1-j.neuschaefer@gmx.net
State New
Headers show
Series fbdev: Update fbdev source file paths | expand

Commit Message

Jonathan Neuschäfer Aug. 29, 2023, 8:02 p.m. UTC
The files fbmem.c, fb_defio.c, fbsysfs.c, fbmon.c, modedb.c, and
fbcmap.c were moved to drivers/video/fbdev, and subsequently to
drivers/video/fbdev/core, in the commits listed below.

Reported by kalekale in #kernel (Libera IRC).

Fixes: f7018c213502 ("video: move fbdev to drivers/video/fbdev")
Fixes: 19757fc8432a ("fbdev: move fbdev core files to separate directory")
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
 include/linux/fb.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--
2.40.1

Comments

Thomas Zimmermann Aug. 30, 2023, 7:10 a.m. UTC | #1
Hi

Am 29.08.23 um 22:02 schrieb Jonathan Neuschäfer:
> The files fbmem.c, fb_defio.c, fbsysfs.c, fbmon.c, modedb.c, and
> fbcmap.c were moved to drivers/video/fbdev, and subsequently to
> drivers/video/fbdev/core, in the commits listed below.
> 
> Reported by kalekale in #kernel (Libera IRC).
> 
> Fixes: f7018c213502 ("video: move fbdev to drivers/video/fbdev")
> Fixes: 19757fc8432a ("fbdev: move fbdev core files to separate directory")
> Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>

IMHO these comments might just be removed.

Best regards
Thomas

> ---
>   include/linux/fb.h | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/include/linux/fb.h b/include/linux/fb.h
> index ce7d588edc3e6..3cda5b9f2469b 100644
> --- a/include/linux/fb.h
> +++ b/include/linux/fb.h
> @@ -592,7 +592,7 @@ extern ssize_t fb_sys_write(struct fb_info *info, const char __user *buf,
>   	__FB_DEFAULT_SYS_OPS_DRAW, \
>   	__FB_DEFAULT_SYS_OPS_MMAP
> 
> -/* drivers/video/fbmem.c */
> +/* drivers/video/fbdev/core/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);
> @@ -636,7 +636,7 @@ static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch,
>   	}
>   }
> 
> -/* drivers/video/fb_defio.c */
> +/* drivers/video/fbdev/core/fb_defio.c */
>   int fb_deferred_io_mmap(struct fb_info *info, struct vm_area_struct *vma);
>   extern int  fb_deferred_io_init(struct fb_info *info);
>   extern void fb_deferred_io_open(struct fb_info *info,
> @@ -735,14 +735,14 @@ static inline bool fb_be_math(struct fb_info *info)
>   #endif /* CONFIG_FB_FOREIGN_ENDIAN */
>   }
> 
> -/* drivers/video/fbsysfs.c */
> +/* drivers/video/fbdev/core/fbsysfs.c */
>   extern struct fb_info *framebuffer_alloc(size_t size, struct device *dev);
>   extern void framebuffer_release(struct fb_info *info);
>   extern int fb_init_device(struct fb_info *fb_info);
>   extern void fb_cleanup_device(struct fb_info *head);
>   extern void fb_bl_default_curve(struct fb_info *fb_info, u8 off, u8 min, u8 max);
> 
> -/* drivers/video/fbmon.c */
> +/* drivers/video/fbdev/core/fbmon.c */
>   #define FB_MAXTIMINGS		0
>   #define FB_VSYNCTIMINGS		1
>   #define FB_HSYNCTIMINGS		2
> @@ -776,7 +776,7 @@ extern int of_get_fb_videomode(struct device_node *np,
>   extern int fb_videomode_from_videomode(const struct videomode *vm,
>   				       struct fb_videomode *fbmode);
> 
> -/* drivers/video/modedb.c */
> +/* drivers/video/fbdev/core/modedb.c */
>   #define VESA_MODEDB_SIZE 43
>   #define DMT_SIZE 0x50
> 
> @@ -802,7 +802,7 @@ extern void fb_videomode_to_modelist(const struct fb_videomode *modedb, int num,
>   extern const struct fb_videomode *fb_find_best_display(const struct fb_monspecs *specs,
>   						       struct list_head *head);
> 
> -/* drivers/video/fbcmap.c */
> +/* drivers/video/fbdev/core/fbcmap.c */
>   extern int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp);
>   extern int fb_alloc_cmap_gfp(struct fb_cmap *cmap, int len, int transp, gfp_t flags);
>   extern void fb_dealloc_cmap(struct fb_cmap *cmap);
> --
> 2.40.1
>
Helge Deller Aug. 31, 2023, 9:49 p.m. UTC | #2
On 8/31/23 11:02, Helge Deller wrote:
> On 8/31/23 10:51, Daniel Vetter wrote:
>> On Thu, Aug 31, 2023 at 08:44:59AM +0200, Jonathan Neuschäfer wrote:
>>> On Wed, Aug 30, 2023 at 09:10:26AM +0200, Thomas Zimmermann wrote:
>>>> Hi
>>>>
>>>> Am 29.08.23 um 22:02 schrieb Jonathan Neuschäfer:
>>>>> The files fbmem.c, fb_defio.c, fbsysfs.c, fbmon.c, modedb.c, and
>>>>> fbcmap.c were moved to drivers/video/fbdev, and subsequently to
>>>>> drivers/video/fbdev/core, in the commits listed below.
>>>>>
>>>>> Reported by kalekale in #kernel (Libera IRC).
>>>>>
>>>>> Fixes: f7018c213502 ("video: move fbdev to drivers/video/fbdev")
>>>>> Fixes: 19757fc8432a ("fbdev: move fbdev core files to separate directory")
>>>>> Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
>>>>
>>>> IMHO these comments might just be removed.
>>>
>>> I think it's nice to have some sort of visual separation between groups
>>> of functions in fb.h, which these comments provide at the moment.
>>> Therefore I'm currently leaning towards my patch as it is, but I'm
>>> willing to have my mind changed and do a v2 which just removes the
>>> comments.
>>
>> Just the filename without the full path maybe?
>
> Yes, I'd prefer that as well.

I've manually changed it and applied the patch to the fbdev git tree.

Thanks!
Helge
Jonathan Neuschäfer Sept. 1, 2023, 5:19 p.m. UTC | #3
On Thu, Aug 31, 2023 at 11:49:47PM +0200, Helge Deller wrote:
> On 8/31/23 11:02, Helge Deller wrote:
> > On 8/31/23 10:51, Daniel Vetter wrote:
> > > On Thu, Aug 31, 2023 at 08:44:59AM +0200, Jonathan Neuschäfer wrote:
> > > > On Wed, Aug 30, 2023 at 09:10:26AM +0200, Thomas Zimmermann wrote:
> > > > > Hi
> > > > > 
> > > > > Am 29.08.23 um 22:02 schrieb Jonathan Neuschäfer:
> > > > > > The files fbmem.c, fb_defio.c, fbsysfs.c, fbmon.c, modedb.c, and
> > > > > > fbcmap.c were moved to drivers/video/fbdev, and subsequently to
> > > > > > drivers/video/fbdev/core, in the commits listed below.
> > > > > > 
> > > > > > Reported by kalekale in #kernel (Libera IRC).
> > > > > > 
> > > > > > Fixes: f7018c213502 ("video: move fbdev to drivers/video/fbdev")
> > > > > > Fixes: 19757fc8432a ("fbdev: move fbdev core files to separate directory")
> > > > > > Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
> > > > > 
> > > > > IMHO these comments might just be removed.
> > > > 
> > > > I think it's nice to have some sort of visual separation between groups
> > > > of functions in fb.h, which these comments provide at the moment.
> > > > Therefore I'm currently leaning towards my patch as it is, but I'm
> > > > willing to have my mind changed and do a v2 which just removes the
> > > > comments.
> > > 
> > > Just the filename without the full path maybe?
> > 
> > Yes, I'd prefer that as well.
> 
> I've manually changed it and applied the patch to the fbdev git tree.

Thanks, everyone!

Jonathan
diff mbox series

Patch

diff --git a/include/linux/fb.h b/include/linux/fb.h
index ce7d588edc3e6..3cda5b9f2469b 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -592,7 +592,7 @@  extern ssize_t fb_sys_write(struct fb_info *info, const char __user *buf,
 	__FB_DEFAULT_SYS_OPS_DRAW, \
 	__FB_DEFAULT_SYS_OPS_MMAP

-/* drivers/video/fbmem.c */
+/* drivers/video/fbdev/core/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);
@@ -636,7 +636,7 @@  static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch,
 	}
 }

-/* drivers/video/fb_defio.c */
+/* drivers/video/fbdev/core/fb_defio.c */
 int fb_deferred_io_mmap(struct fb_info *info, struct vm_area_struct *vma);
 extern int  fb_deferred_io_init(struct fb_info *info);
 extern void fb_deferred_io_open(struct fb_info *info,
@@ -735,14 +735,14 @@  static inline bool fb_be_math(struct fb_info *info)
 #endif /* CONFIG_FB_FOREIGN_ENDIAN */
 }

-/* drivers/video/fbsysfs.c */
+/* drivers/video/fbdev/core/fbsysfs.c */
 extern struct fb_info *framebuffer_alloc(size_t size, struct device *dev);
 extern void framebuffer_release(struct fb_info *info);
 extern int fb_init_device(struct fb_info *fb_info);
 extern void fb_cleanup_device(struct fb_info *head);
 extern void fb_bl_default_curve(struct fb_info *fb_info, u8 off, u8 min, u8 max);

-/* drivers/video/fbmon.c */
+/* drivers/video/fbdev/core/fbmon.c */
 #define FB_MAXTIMINGS		0
 #define FB_VSYNCTIMINGS		1
 #define FB_HSYNCTIMINGS		2
@@ -776,7 +776,7 @@  extern int of_get_fb_videomode(struct device_node *np,
 extern int fb_videomode_from_videomode(const struct videomode *vm,
 				       struct fb_videomode *fbmode);

-/* drivers/video/modedb.c */
+/* drivers/video/fbdev/core/modedb.c */
 #define VESA_MODEDB_SIZE 43
 #define DMT_SIZE 0x50

@@ -802,7 +802,7 @@  extern void fb_videomode_to_modelist(const struct fb_videomode *modedb, int num,
 extern const struct fb_videomode *fb_find_best_display(const struct fb_monspecs *specs,
 						       struct list_head *head);

-/* drivers/video/fbcmap.c */
+/* drivers/video/fbdev/core/fbcmap.c */
 extern int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp);
 extern int fb_alloc_cmap_gfp(struct fb_cmap *cmap, int len, int transp, gfp_t flags);
 extern void fb_dealloc_cmap(struct fb_cmap *cmap);