diff for duplicates of <201108212242.12717.linux@rainbow-software.org> diff --git a/a/1.txt b/N1/1.txt index 91f8544..267537c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -527,7 +527,7 @@ no signed-off-by yet + vslen = var->vsync_len; + upper = var->upper_margin; + -+ if (vxres * vyres * ((bpp + 1) / 8) > info->screen_size || vyres = yres) { ++ if (vxres * vyres * ((bpp + 1) / 8) > info->screen_size || vyres == yres) { + vyres = info->screen_size / vxres / ((bpp + 1) / 8); + if (vyres < yres) + return -ENOMEM; @@ -627,7 +627,7 @@ no signed-off-by yet + break; + case 15: /* 0rrrrrgg gggbbbbb */ + case 16: /* rrrrrggg gggbbbbb */ -+ par->pixelpipe_cfg1 = (var->green.length = 6) ? DISPLAY_16BPP_MODE : DISPLAY_15BPP_MODE; ++ par->pixelpipe_cfg1 = (var->green.length == 6) ? DISPLAY_16BPP_MODE : DISPLAY_15BPP_MODE; + par->crtc[VGA_CRTC_OFFSET] = vxres >> 2; + par->ext_offset = vxres >> 10; + par->bitblt_cntl = COLEXP_16BPP; @@ -888,7 +888,7 @@ no signed-off-by yet + vga_unprotect(par); + + info->fix.line_length = info->var.xres_virtual * info->var.bits_per_pixel / 8; -+ if (info->var.bits_per_pixel = 8) ++ if (info->var.bits_per_pixel == 8) + info->fix.visual = FB_VISUAL_PSEUDOCOLOR; + else + info->fix.visual = FB_VISUAL_TRUECOLOR; @@ -915,9 +915,9 @@ no signed-off-by yet + case 16: + if (regno >= 16) + return 0; -+ if (info->var.green.length = 5) ++ if (info->var.green.length == 5) + ((u32 *)info->pseudo_palette)[regno] = ((red & 0xF800) >> 1) | ((green & 0xF800) >> 6) | ((blue & 0xF800) >> 11); -+ else if (info->var.green.length = 6) ++ else if (info->var.green.length == 6) + ((u32 *)info->pseudo_palette)[regno] = (red & 0xF800) | ((green & 0xFC00) >> 5) | ((blue & 0xF800) >> 11); + else + return -EINVAL; @@ -1016,7 +1016,7 @@ no signed-off-by yet + i740outreg(par, XRX, DPMS_SYNC_SELECT, DPMSSyncSelect); + + /* Let fbcon do a soft blank for us */ -+ return (blank_mode = FB_BLANK_NORMAL) ? 1 : 0; ++ return (blank_mode == FB_BLANK_NORMAL) ? 1 : 0; +} + +static struct fb_ops i740fb_ops = { @@ -1084,7 +1084,7 @@ no signed-off-by yet + } + + /* detect memory size */ -+ if ((i740inreg(par, XRX, DRAM_ROW_TYPE) & DRAM_ROW_1) = DRAM_ROW_1_SDRAM) ++ if ((i740inreg(par, XRX, DRAM_ROW_TYPE) & DRAM_ROW_1) == DRAM_ROW_1_SDRAM) + i740outb(par, XRX, DRAM_ROW_BNDRY_1); + else + i740outb(par, XRX, DRAM_ROW_BNDRY_0); @@ -1105,7 +1105,7 @@ no signed-off-by yet + info->fix.smem_len = info->screen_size; + info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN; + -+ if (i740fb_setup_ddc_bus(info) = 0) { ++ if (i740fb_setup_ddc_bus(info) == 0) { + par->ddc_registered = true; + edid = fb_ddc_read(&par->ddc_adapter); + if (edid) { @@ -1123,7 +1123,7 @@ no signed-off-by yet + if (m) { + fb_videomode_to_var(&info->var, m); + /* fill all other info->var's fields */ -+ if (i740fb_check_var(&info->var, info) = 0) ++ if (i740fb_check_var(&info->var, info) == 0) + found = true; + } + } @@ -1137,7 +1137,7 @@ no signed-off-by yet + ret = fb_find_mode(&info->var, info, mode_option, + info->monspecs.modedb, info->monspecs.modedb_len, + NULL, info->var.bits_per_pixel); -+ if (!ret || ret = 4) { ++ if (!ret || ret == 4) { + dev_err(info->device, "mode %s not found\n", mode_option); + ret = -EINVAL; + } @@ -1146,7 +1146,7 @@ no signed-off-by yet + fb_destroy_modedb(info->monspecs.modedb); + info->monspecs.modedb = NULL; + -+ if (ret = -EINVAL) ++ if (ret == -EINVAL) + goto err_find_mode; + + ret = fb_alloc_cmap(&info->cmap, 256, 0); diff --git a/a/content_digest b/N1/content_digest index b0a3a14..26c561a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Ondrej Zary <linux@rainbow-software.org>\0" "Subject\0[RFC PATCH v2] Resurrect Intel740 driver: i740fb\0" - "Date\0Sun, 21 Aug 2011 20:42:06 +0000\0" + "Date\0Sun, 21 Aug 2011 22:42:06 +0200\0" "To\0linux-fbdev@vger.kernel.org\0" "Cc\0Kernel development list <linux-kernel@vger.kernel.org>" Paul Mundt <lethal@linux-sh.org> @@ -536,7 +536,7 @@ "+\tvslen = var->vsync_len;\n" "+\tupper = var->upper_margin;\n" "+\n" - "+\tif (vxres * vyres * ((bpp + 1) / 8) > info->screen_size || vyres = yres) {\n" + "+\tif (vxres * vyres * ((bpp + 1) / 8) > info->screen_size || vyres == yres) {\n" "+\t\tvyres = info->screen_size / vxres / ((bpp + 1) / 8);\n" "+\t\tif (vyres < yres)\n" "+\t\t\treturn -ENOMEM;\n" @@ -636,7 +636,7 @@ "+\t\tbreak;\n" "+\tcase 15: /* 0rrrrrgg gggbbbbb */\n" "+\tcase 16: /* rrrrrggg gggbbbbb */\n" - "+\t\tpar->pixelpipe_cfg1 = (var->green.length = 6) ? DISPLAY_16BPP_MODE : DISPLAY_15BPP_MODE;\n" + "+\t\tpar->pixelpipe_cfg1 = (var->green.length == 6) ? DISPLAY_16BPP_MODE : DISPLAY_15BPP_MODE;\n" "+\t\tpar->crtc[VGA_CRTC_OFFSET] = vxres >> 2;\n" "+\t\tpar->ext_offset = vxres >> 10;\n" "+\t\tpar->bitblt_cntl = COLEXP_16BPP;\n" @@ -897,7 +897,7 @@ "+\tvga_unprotect(par);\n" "+\n" "+\tinfo->fix.line_length = info->var.xres_virtual * info->var.bits_per_pixel / 8;\n" - "+\tif (info->var.bits_per_pixel = 8)\n" + "+\tif (info->var.bits_per_pixel == 8)\n" "+\t\tinfo->fix.visual = FB_VISUAL_PSEUDOCOLOR;\n" "+\telse\n" "+\t\tinfo->fix.visual = FB_VISUAL_TRUECOLOR;\n" @@ -924,9 +924,9 @@ "+\tcase 16:\n" "+\t\tif (regno >= 16)\n" "+\t\t\treturn 0;\n" - "+\t\tif (info->var.green.length = 5)\n" + "+\t\tif (info->var.green.length == 5)\n" "+\t\t\t((u32 *)info->pseudo_palette)[regno] = ((red & 0xF800) >> 1) | ((green & 0xF800) >> 6) | ((blue & 0xF800) >> 11);\n" - "+\t\telse if (info->var.green.length = 6)\n" + "+\t\telse if (info->var.green.length == 6)\n" "+\t\t\t((u32 *)info->pseudo_palette)[regno] = (red & 0xF800) |\t((green & 0xFC00) >> 5) | ((blue & 0xF800) >> 11);\n" "+\t\telse\n" "+\t\t\treturn -EINVAL;\n" @@ -1025,7 +1025,7 @@ "+\ti740outreg(par, XRX, DPMS_SYNC_SELECT, DPMSSyncSelect);\n" "+\n" "+\t/* Let fbcon do a soft blank for us */\n" - "+\treturn (blank_mode = FB_BLANK_NORMAL) ? 1 : 0;\n" + "+\treturn (blank_mode == FB_BLANK_NORMAL) ? 1 : 0;\n" "+}\n" "+\n" "+static struct fb_ops i740fb_ops = {\n" @@ -1093,7 +1093,7 @@ "+\t}\n" "+\n" "+\t/* detect memory size */\n" - "+\tif ((i740inreg(par, XRX, DRAM_ROW_TYPE) & DRAM_ROW_1) = DRAM_ROW_1_SDRAM)\n" + "+\tif ((i740inreg(par, XRX, DRAM_ROW_TYPE) & DRAM_ROW_1) == DRAM_ROW_1_SDRAM)\n" "+\t\ti740outb(par, XRX, DRAM_ROW_BNDRY_1);\n" "+\telse\n" "+\t\ti740outb(par, XRX, DRAM_ROW_BNDRY_0);\n" @@ -1114,7 +1114,7 @@ "+\tinfo->fix.smem_len = info->screen_size;\n" "+\tinfo->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;\n" "+\n" - "+\tif (i740fb_setup_ddc_bus(info) = 0) {\n" + "+\tif (i740fb_setup_ddc_bus(info) == 0) {\n" "+\t\tpar->ddc_registered = true;\n" "+\t\tedid = fb_ddc_read(&par->ddc_adapter);\n" "+\t\tif (edid) {\n" @@ -1132,7 +1132,7 @@ "+\t\t\t\tif (m) {\n" "+\t\t\t\t\tfb_videomode_to_var(&info->var, m);\n" "+\t\t\t\t\t/* fill all other info->var's fields */\n" - "+\t\t\t\t\tif (i740fb_check_var(&info->var, info) = 0)\n" + "+\t\t\t\t\tif (i740fb_check_var(&info->var, info) == 0)\n" "+\t\t\t\t\t\tfound = true;\n" "+\t\t\t\t}\n" "+\t\t\t}\n" @@ -1146,7 +1146,7 @@ "+\t\tret = fb_find_mode(&info->var, info, mode_option,\n" "+\t\t\t\t info->monspecs.modedb, info->monspecs.modedb_len,\n" "+\t\t\t\t NULL, info->var.bits_per_pixel);\n" - "+\t\tif (!ret || ret = 4) {\n" + "+\t\tif (!ret || ret == 4) {\n" "+\t\t\tdev_err(info->device, \"mode %s not found\\n\", mode_option);\n" "+\t\t\tret = -EINVAL;\n" "+\t\t}\n" @@ -1155,7 +1155,7 @@ "+\tfb_destroy_modedb(info->monspecs.modedb);\n" "+\tinfo->monspecs.modedb = NULL;\n" "+\n" - "+\tif (ret = -EINVAL)\n" + "+\tif (ret == -EINVAL)\n" "+\t\tgoto err_find_mode;\n" "+\n" "+\tret = fb_alloc_cmap(&info->cmap, 256, 0);\n" @@ -1632,4 +1632,4 @@ "-- \n" Ondrej Zary -9f2b248a8bc1a5a765e593cceee53fb99731ab49e9672d9657971168fdbf2bfd +311ce48a7c089fbe42364888321372708ffdb1dd252eb4b7bcad579b34d8fbd9
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.