aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@linux-mips.org>2007-10-16 01:29:57 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 09:43:23 -0700
commit102a1a20d2b0a412d4cd4a9f047761f7925405ff (patch)
tree653195a9a501f0633f28c72ab17b01eb73f0d6e2 /drivers/video
parenttgafb: fix an out-of-range shift in mono imageblit (diff)
downloadlinux-dev-102a1a20d2b0a412d4cd4a9f047761f7925405ff.tar.xz
linux-dev-102a1a20d2b0a412d4cd4a9f047761f7925405ff.zip
tgafb: remove a redundant non-mono test in mono imageblit
There is a test in tgafb_mono_imageblit() for a colour image with a fall-back to cfb_imageblit(). The test is not necessary as the only caller, which is tgafb_imageblit(), checks it too and only invokes this function for monochrome images. It looks like a left-over from before some changes to tgafb_imageblit(). Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Cc: Antonino Daplas <adaplas@pol.net> Cc: Jay Estabrook <Jay.Estabrook@hp.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/tgafb.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index 5539f4d9cb74..680642c089c9 100644
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -637,15 +637,6 @@ tgafb_mono_imageblit(struct fb_info *info, const struct fb_image *image)
is8bpp = info->var.bits_per_pixel == 8;
- /* For copies that aren't pixel expansion, there's little we
- can do better than the generic code. */
- /* ??? There is a DMA write mode; I wonder if that could be
- made to pull the data from the image buffer... */
- if (image->depth > 1) {
- cfb_imageblit(info, image);
- return;
- }
-
dx = image->dx;
dy = image->dy;
width = image->width;