[PATCH] atyfb: Remove dead code

[linux-2.6-omap-h63xx.git] / drivers / video / asiliantfb.c

diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c
index c64de59398f499e80507a3e3d582f90d8515bf19..c924d81f7978f2b01ee391afa38e3461357ab0b1 100644 (file)
--- a/drivers/video/asiliantfb.c
+++ b/drivers/video/asiliantfb.c
@@ -322,32 +322,29 @@ static int asiliantfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
        writeb(green, mmio_base + 0x791);
        writeb(blue, mmio_base + 0x791);
 
-       switch(p->var.bits_per_pixel) {
-       case 15:
-               if (regno < 16) {
+       if (regno < 16) {
+               switch(p->var.red.offset) {
+               case 10: /* RGB 555 */
                        ((u32 *)(p->pseudo_palette))[regno] =
                                ((red & 0xf8) << 7) |
                                ((green & 0xf8) << 2) |
                                ((blue & 0xf8) >> 3);
-               }
-               break;
-       case 16:
-               if (regno < 16) {
+                       break;
+               case 11: /* RGB 565 */
                        ((u32 *)(p->pseudo_palette))[regno] =
                                ((red & 0xf8) << 8) |
                                ((green & 0xfc) << 3) |
                                ((blue & 0xf8) >> 3);
-               }
-               break;
-       case 24:
-               if (regno < 24) {
+                       break;
+               case 16: /* RGB 888 */
                        ((u32 *)(p->pseudo_palette))[regno] =
                                (red << 16)  |
                                (green << 8) |
                                (blue);
+                       break;
                }
-               break;
        }
+
        return 0;
 }
 
@@ -549,7 +546,7 @@ asiliantfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
        if (!request_mem_region(addr, size, "asiliantfb"))
                return -EBUSY;
 
-       p = framebuffer_alloc(sizeof(u32) * 256, &dp->dev);
+       p = framebuffer_alloc(sizeof(u32) * 16, &dp->dev);
        if (!p) {
                release_mem_region(addr, size);
                return -ENOMEM;