diff for duplicates of <1434462131-15191-6-git-send-email-sudipm.mukherjee@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 70dfb15..c3e5fe8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,7 @@ index 6bdcd5b..1e60d36 100644 * 16/32 bit true-colour, use pseudo-palette for 16 base color */ - if (regno < 16) { -- if (sfb->fb->var.bits_per_pixel == 16) { +- if (sfb->fb->var.bits_per_pixel = 16) { - u32 *pal = sfb->fb->pseudo_palette; - - val = chan_to_field(red, &sfb->fb->var.red); @@ -23,15 +23,14 @@ index 6bdcd5b..1e60d36 100644 - val |= chan_to_field(blue, &sfb->fb->var.blue); + if (regno >= 16) + break; -+ if (sfb->fb->var.bits_per_pixel == 16) { ++ if (sfb->fb->var.bits_per_pixel = 16) { + u32 *pal = sfb->fb->pseudo_palette; + + val = chan_to_field(red, &sfb->fb->var.red); + val |= chan_to_field(green, &sfb->fb->var.green); + val |= chan_to_field(blue, &sfb->fb->var.blue); #ifdef __BIG_ENDIAN -- pal[regno] = -- ((red & 0xf800) >> 8) | +- pal[regno] - ((red & 0xf800) >> 8) | - ((green & 0xe000) >> 13) | - ((green & 0x1c00) << 3) | - ((blue & 0xf800) >> 3); @@ -56,8 +55,7 @@ index 6bdcd5b..1e60d36 100644 + val |= chan_to_field(green, &sfb->fb->var.green); + val |= chan_to_field(blue, &sfb->fb->var.blue); #ifdef __BIG_ENDIAN -- val = -- (val & 0xff00ff00 >> 8) | +- val - (val & 0xff00ff00 >> 8) | - (val & 0x00ff00ff << 8); + val = (val & 0xff00ff00 >> 8) | + (val & 0x00ff00ff << 8); @@ -72,10 +70,10 @@ index 6bdcd5b..1e60d36 100644 sfb->width, sfb->height, sfb->fb->var.bits_per_pixel, sfb->hz); for (j = 0; j < ARRAY_SIZE(vgamode); j++) { -- if (vgamode[j].mmsizex == sfb->width && -- vgamode[j].mmsizey == sfb->height && -- vgamode[j].bpp == sfb->fb->var.bits_per_pixel && -- vgamode[j].hz == sfb->hz) { +- if (vgamode[j].mmsizex = sfb->width && +- vgamode[j].mmsizey = sfb->height && +- vgamode[j].bpp = sfb->fb->var.bits_per_pixel && +- vgamode[j].hz = sfb->hz) { - dev_dbg(&sfb->pdev->dev, - "vgamode[j].mmsizex=%d vgamode[j].mmSizeY=%d vgamode[j].bpp=%d vgamode[j].hz=%d\n", - vgamode[j].mmsizex, vgamode[j].mmsizey, diff --git a/a/content_digest b/N1/content_digest index bf57d31..8191102 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,7 +8,7 @@ "Subject\0[PATCH 6/8] staging: sm7xxfb: reduce indention\0" ] [ - "Date\0Tue, 16 Jun 2015 19:12:09 +0530\0" + "Date\0Tue, 16 Jun 2015 13:54:09 +0000\0" ] [ "To\0Greg Kroah-Hartman <gregkh\@linuxfoundation.org>\0" @@ -43,7 +43,7 @@ " \t\t * 16/32 bit true-colour, use pseudo-palette for 16 base color\n", " \t\t */\n", "-\t\tif (regno < 16) {\n", - "-\t\t\tif (sfb->fb->var.bits_per_pixel == 16) {\n", + "-\t\t\tif (sfb->fb->var.bits_per_pixel = 16) {\n", "-\t\t\t\tu32 *pal = sfb->fb->pseudo_palette;\n", "-\n", "-\t\t\t\tval = chan_to_field(red, &sfb->fb->var.red);\n", @@ -52,15 +52,14 @@ "-\t\t\t\tval |= chan_to_field(blue, &sfb->fb->var.blue);\n", "+\t\tif (regno >= 16)\n", "+\t\t\tbreak;\n", - "+\t\tif (sfb->fb->var.bits_per_pixel == 16) {\n", + "+\t\tif (sfb->fb->var.bits_per_pixel = 16) {\n", "+\t\t\tu32 *pal = sfb->fb->pseudo_palette;\n", "+\n", "+\t\t\tval = chan_to_field(red, &sfb->fb->var.red);\n", "+\t\t\tval |= chan_to_field(green, &sfb->fb->var.green);\n", "+\t\t\tval |= chan_to_field(blue, &sfb->fb->var.blue);\n", " #ifdef __BIG_ENDIAN\n", - "-\t\t\t\tpal[regno] =\n", - "-\t\t\t\t ((red & 0xf800) >> 8) |\n", + "-\t\t\t\tpal[regno] -\t\t\t\t ((red & 0xf800) >> 8) |\n", "-\t\t\t\t ((green & 0xe000) >> 13) |\n", "-\t\t\t\t ((green & 0x1c00) << 3) |\n", "-\t\t\t\t ((blue & 0xf800) >> 3);\n", @@ -85,8 +84,7 @@ "+\t\t\tval |= chan_to_field(green, &sfb->fb->var.green);\n", "+\t\t\tval |= chan_to_field(blue, &sfb->fb->var.blue);\n", " #ifdef __BIG_ENDIAN\n", - "-\t\t\t\tval =\n", - "-\t\t\t\t (val & 0xff00ff00 >> 8) |\n", + "-\t\t\t\tval -\t\t\t\t (val & 0xff00ff00 >> 8) |\n", "-\t\t\t\t (val & 0x00ff00ff << 8);\n", "+\t\t\tval = (val & 0xff00ff00 >> 8) |\n", "+\t\t\t (val & 0x00ff00ff << 8);\n", @@ -101,10 +99,10 @@ " \t\tsfb->width, sfb->height, sfb->fb->var.bits_per_pixel, sfb->hz);\n", " \n", " \tfor (j = 0; j < ARRAY_SIZE(vgamode); j++) {\n", - "-\t\tif (vgamode[j].mmsizex == sfb->width &&\n", - "-\t\t vgamode[j].mmsizey == sfb->height &&\n", - "-\t\t vgamode[j].bpp == sfb->fb->var.bits_per_pixel &&\n", - "-\t\t vgamode[j].hz == sfb->hz) {\n", + "-\t\tif (vgamode[j].mmsizex = sfb->width &&\n", + "-\t\t vgamode[j].mmsizey = sfb->height &&\n", + "-\t\t vgamode[j].bpp = sfb->fb->var.bits_per_pixel &&\n", + "-\t\t vgamode[j].hz = sfb->hz) {\n", "-\t\t\tdev_dbg(&sfb->pdev->dev,\n", "-\t\t\t\t\"vgamode[j].mmsizex=%d vgamode[j].mmSizeY=%d vgamode[j].bpp=%d vgamode[j].hz=%d\\n\",\n", "-\t\t\t\tvgamode[j].mmsizex, vgamode[j].mmsizey,\n", @@ -235,4 +233,4 @@ "1.8.1.2" ] -db3b3612bdfd9ccf6187fc43a047743ddc062f87d9a656aec778aee85855e988 +e41ce1ffaf880bfc1d51611efeba51e8a765ff0a751c21f88937eaf6aec83199
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.