The patch titled
Subject: goldfish-framebuffer-driver-fix
has been removed from the -mm tree. Its filename was
goldfish-framebuffer-driver-fix.patch
This patch was dropped because it was folded into goldfish-framebuffer-driver.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: goldfish-framebuffer-driver-fix
fix (silly) sparse warnings
Cc: Alan Cox <alan@xxxxxxxxxxxxxxx>
Cc: Arve Hjønnevåg <arve@xxxxxxxxxxx>
Cc: Bruce Beare <bruce.j.beare@xxxxxxxxx>
Cc: Florian Tobias Schandinat <FlorianSchandinat@xxxxxx>
Cc: Jun Nakajima <jun.nakajima@xxxxxxxxx>
Cc: Mike A. Chan <mikechan@xxxxxxxxxx>
Cc: Sheng Yang <sheng@xxxxxxxxxxxxxxx>
Cc: Tom Keel <thomas.keel@xxxxxxxxx>
Cc: Tomi Valkeinen <tomi.valkeinen@xxxxxx>
Cc: Xiaohui Xin <xiaohui.xin@xxxxxxxxx>
Cc: Yunhong Jiang <yunhong.jiang@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/goldfishfb.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff -puN drivers/video/goldfishfb.c~goldfish-framebuffer-driver-fix drivers/video/goldfishfb.c
--- a/drivers/video/goldfishfb.c~goldfish-framebuffer-driver-fix
+++ a/drivers/video/goldfishfb.c
@@ -244,11 +244,12 @@ static int goldfish_fb_probe(struct plat
fb->fb.var.blue.length = 5;
framesize = width * height * 2 * 2;
- fb->fb.screen_base = dma_alloc_coherent(&pdev->dev, framesize,
+ fb->fb.screen_base = (char __force __iomem *)dma_alloc_coherent(
+ &pdev->dev, framesize,
&fbpaddr, GFP_KERNEL);
pr_debug("allocating frame buffer %d * %d, got %p\n",
width, height, fb->fb.screen_base);
- if (fb->fb.screen_base == 0) {
+ if (fb->fb.screen_base == NULL) {
ret = -ENOMEM;
goto err_alloc_screen_base_failed;
}
@@ -277,7 +278,8 @@ err_register_framebuffer_failed:
err_request_irq_failed:
err_fb_set_var_failed:
dma_free_coherent(&pdev->dev, framesize,
- fb->fb.screen_base, fb->fb.fix.smem_start);
+ (void *)fb->fb.screen_base,
+ fb->fb.fix.smem_start);
err_alloc_screen_base_failed:
err_no_irq:
iounmap(fb->reg_base);
@@ -296,7 +298,7 @@ static int goldfish_fb_remove(struct pla
unregister_framebuffer(&fb->fb);
free_irq(fb->irq, fb);
- dma_free_coherent(&pdev->dev, framesize, fb->fb.screen_base,
+ dma_free_coherent(&pdev->dev, framesize, (void *)fb->fb.screen_base,
fb->fb.fix.smem_start);
iounmap(fb->reg_base);
return 0;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
bugh-prevent-double-evaulation-of-in-build_bug_on.patch
bugh-compilerh-introduce-compiletime_assert-build_bug_on_msg.patch
goldfish-framebuffer-driver.patch
ocfs2-remove-kfree-redundant-null-checks.patch
scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes.patch
sys_prctl-coding-style-cleanup.patch
backlight-add-lms501kf03-lcd-driver.patch
drivers-video-backlight-makefile-cleanup.patch
checkpatch-dont-emit-the-camelcase-warning-for-pagefoo.patch
rtc-max77686-add-maxim-77686-driver.patch
rtc-pcf8523-add-low-battery-voltage-support.patch
rtc-add-rtc-driver-for-tps80031-tps80032.patch
rtc-add-support-for-spi-rtc-rx4581.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
