diff options
author | Manuel Lauss <manuel.lauss@googlemail.com> | 2012-03-24 06:38:02 -0400 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-04-08 10:27:09 -0400 |
commit | 93019734555f8df32239c5922fe2b770c0a08eaa (patch) | |
tree | bb99147eae71a6e9e93cb249967ddc380c296579 /drivers/video | |
parent | ef798d0207e02e05bfabc7ba96e8a6f2cc07066e (diff) |
fbdev: fix au1*fb builds
Commit 1c16697bf9d5b206cb0d2b905a54de5e077296be
("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 <manuel.lauss@googlemail.com>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/au1100fb.c | 5 | ||||
-rw-r--r-- | drivers/video/au1200fb.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c index befcbd8ef019..ffbce4525468 100644 --- a/drivers/video/au1100fb.c +++ b/drivers/video/au1100fb.c | |||
@@ -499,7 +499,8 @@ static int __devinit au1100fb_drv_probe(struct platform_device *dev) | |||
499 | au1100fb_fix.mmio_start = regs_res->start; | 499 | au1100fb_fix.mmio_start = regs_res->start; |
500 | au1100fb_fix.mmio_len = resource_size(regs_res); | 500 | au1100fb_fix.mmio_len = resource_size(regs_res); |
501 | 501 | ||
502 | if (!devm_request_mem_region(au1100fb_fix.mmio_start, | 502 | if (!devm_request_mem_region(&dev->dev, |
503 | au1100fb_fix.mmio_start, | ||
503 | au1100fb_fix.mmio_len, | 504 | au1100fb_fix.mmio_len, |
504 | DRIVER_NAME)) { | 505 | DRIVER_NAME)) { |
505 | print_err("fail to lock memory region at 0x%08lx", | 506 | print_err("fail to lock memory region at 0x%08lx", |
@@ -516,7 +517,7 @@ static int __devinit au1100fb_drv_probe(struct platform_device *dev) | |||
516 | fbdev->fb_len = fbdev->panel->xres * fbdev->panel->yres * | 517 | fbdev->fb_len = fbdev->panel->xres * fbdev->panel->yres * |
517 | (fbdev->panel->bpp >> 3) * AU1100FB_NBR_VIDEO_BUFFERS; | 518 | (fbdev->panel->bpp >> 3) * AU1100FB_NBR_VIDEO_BUFFERS; |
518 | 519 | ||
519 | fbdev->fb_mem = dmam_alloc_coherent(&dev->dev, &dev->dev, | 520 | fbdev->fb_mem = dmam_alloc_coherent(&dev->dev, |
520 | PAGE_ALIGN(fbdev->fb_len), | 521 | PAGE_ALIGN(fbdev->fb_len), |
521 | &fbdev->fb_phys, GFP_KERNEL); | 522 | &fbdev->fb_phys, GFP_KERNEL); |
522 | if (!fbdev->fb_mem) { | 523 | if (!fbdev->fb_mem) { |
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c index 3e9a773db09f..7ca79f02056e 100644 --- a/drivers/video/au1200fb.c +++ b/drivers/video/au1200fb.c | |||
@@ -1724,7 +1724,7 @@ static int __devinit au1200fb_drv_probe(struct platform_device *dev) | |||
1724 | /* Allocate the framebuffer to the maximum screen size */ | 1724 | /* Allocate the framebuffer to the maximum screen size */ |
1725 | fbdev->fb_len = (win->w[plane].xres * win->w[plane].yres * bpp) / 8; | 1725 | fbdev->fb_len = (win->w[plane].xres * win->w[plane].yres * bpp) / 8; |
1726 | 1726 | ||
1727 | fbdev->fb_mem = dmam_alloc_noncoherent(&dev->dev, &dev->dev, | 1727 | fbdev->fb_mem = dmam_alloc_noncoherent(&dev->dev, |
1728 | PAGE_ALIGN(fbdev->fb_len), | 1728 | PAGE_ALIGN(fbdev->fb_len), |
1729 | &fbdev->fb_phys, GFP_KERNEL); | 1729 | &fbdev->fb_phys, GFP_KERNEL); |
1730 | if (!fbdev->fb_mem) { | 1730 | if (!fbdev->fb_mem) { |