fbdev: Avoid file argument in fb_pgprotect()
authorThomas Zimmermann <tzimmermann@suse.de>
Fri, 22 Sep 2023 08:04:55 +0000 (10:04 +0200)
committerThomas Zimmermann <tzimmermann@suse.de>
Thu, 12 Oct 2023 07:20:39 +0000 (09:20 +0200)
Only PowerPC's fb_pgprotect() needs the file argument, although
the implementation in either phys_mem_access_prot() or
pci_phys_mem_access_prot() does not use it. Pass NULL to the internal
helper in preparation of further updates. A later patch will remove
the file parameter from fb_pgprotect().

While at it, replace the shift operation with PHYS_PFN().

v5:
* state function names in commit description (Javier)

Suggested-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230922080636.26762-2-tzimmermann@suse.de
arch/powerpc/include/asm/fb.h

index 5f1a2e5..61e3b88 100644 (file)
@@ -9,7 +9,12 @@
 static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
                                unsigned long off)
 {
-       vma->vm_page_prot = phys_mem_access_prot(file, off >> PAGE_SHIFT,
+       /*
+        * PowerPC's implementation of phys_mem_access_prot() does
+        * not use the file argument. Set it to NULL in preparation
+        * of later updates to the interface.
+        */
+       vma->vm_page_prot = phys_mem_access_prot(NULL, PHYS_PFN(off),
                                                 vma->vm_end - vma->vm_start,
                                                 vma->vm_page_prot);
 }