V4L/DVB (10176a): Switch remaining clear_user_page users over to clear_user_highpage

Not all architectures provide clear_user_page(), but clear_user_highpage()
is available everywhere at least via the compatibility inline function.

Is this the "trivial patch" that's required for these two drivers?

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index bc6d5aba0fe676089491687ec4d2f9f52f80c045..da1790e57a86c87b03c530deb58435cab036b80d 100644 (file)
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -388,8 +388,7 @@ videobuf_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
        page = alloc_page(GFP_USER | __GFP_DMA32);
        if (!page)
                return VM_FAULT_OOM;
-       clear_user_page(page_address(page), (unsigned long)vmf->virtual_address,
-                       page);
+       clear_user_highpage(page, (unsigned long)vmf->virtual_address);
        vmf->page = page;
        return 0;
 }

diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/go7007/go7007-v4l2.c
index 4f7237a03ad1e8fe1229ae5977245d96a69bce36..868edb65e7bf6fe27fc05251e4efe3351fc74a6d 100644 (file)
--- a/drivers/staging/go7007/go7007-v4l2.c
+++ b/drivers/staging/go7007/go7007-v4l2.c
@@ -1712,8 +1712,7 @@ static int go7007_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
        page = alloc_page(GFP_USER | __GFP_DMA32);
        if (!page)
                return VM_FAULT_OOM;
-       clear_user_page(page_address(page), (unsigned long)vmf->virtual_address,
-                       page);
+       clear_user_highpage(page, (unsigned long)vmf->virtual_address);
        vmf->page = page;
        return 0;
 }