Skip to content

Commit 9301973

Browse files
Manuel Laussschandinat
Manuel Lauss
authored andcommitted
fbdev: fix au1*fb builds
Commit 1c16697 ("drivers/video/au*fb.c: use devm_ functions) introduced 2 build failures in the au1100fb and au1200fb drivers, fix them. Signed-off-by: Manuel Lauss <[email protected]> Signed-off-by: Florian Tobias Schandinat <[email protected]>
1 parent ef798d0 commit 9301973

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

drivers/video/au1100fb.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,8 @@ static int __devinit au1100fb_drv_probe(struct platform_device *dev)
499499
au1100fb_fix.mmio_start = regs_res->start;
500500
au1100fb_fix.mmio_len = resource_size(regs_res);
501501

502-
if (!devm_request_mem_region(au1100fb_fix.mmio_start,
502+
if (!devm_request_mem_region(&dev->dev,
503+
au1100fb_fix.mmio_start,
503504
au1100fb_fix.mmio_len,
504505
DRIVER_NAME)) {
505506
print_err("fail to lock memory region at 0x%08lx",
@@ -516,7 +517,7 @@ static int __devinit au1100fb_drv_probe(struct platform_device *dev)
516517
fbdev->fb_len = fbdev->panel->xres * fbdev->panel->yres *
517518
(fbdev->panel->bpp >> 3) * AU1100FB_NBR_VIDEO_BUFFERS;
518519

519-
fbdev->fb_mem = dmam_alloc_coherent(&dev->dev, &dev->dev,
520+
fbdev->fb_mem = dmam_alloc_coherent(&dev->dev,
520521
PAGE_ALIGN(fbdev->fb_len),
521522
&fbdev->fb_phys, GFP_KERNEL);
522523
if (!fbdev->fb_mem) {

drivers/video/au1200fb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1724,7 +1724,7 @@ static int __devinit au1200fb_drv_probe(struct platform_device *dev)
17241724
/* Allocate the framebuffer to the maximum screen size */
17251725
fbdev->fb_len = (win->w[plane].xres * win->w[plane].yres * bpp) / 8;
17261726

1727-
fbdev->fb_mem = dmam_alloc_noncoherent(&dev->dev, &dev->dev,
1727+
fbdev->fb_mem = dmam_alloc_noncoherent(&dev->dev,
17281728
PAGE_ALIGN(fbdev->fb_len),
17291729
&fbdev->fb_phys, GFP_KERNEL);
17301730
if (!fbdev->fb_mem) {

0 commit comments

Comments
 (0)