diff for duplicates of <20150209125548.GA27277@linuxteamdev.amer.dell.com> diff --git a/a/1.txt b/N1/1.txt index c20e003..60fa292 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,13 +7,13 @@ three trivial error in efifb.c file. And I have also changed printk with pr_err, pr_info ... at respective places. ->From c49139fac1d15fe2da80d06e2a79eb8be7c079a7 Mon Sep 17 00:00:00 2001 -From: Parmeshwr Prasad <parmeshwr_prasad-8PEkshWhKlo@public.gmane.org> +From c49139fac1d15fe2da80d06e2a79eb8be7c079a7 Mon Sep 17 00:00:00 2001 +From: Parmeshwr Prasad <parmeshwr_prasad@dell.com> Date: Mon, 9 Feb 2015 07:33:59 -0500 Subject: [PATCH] Trival patch: improved indentation, and removed some ERROR from code -Signed-off-by: Parmeshwr Prasad <parmeshwr_prasad-8PEkshWhKlo@public.gmane.org> +Signed-off-by: Parmeshwr Prasad <parmeshwr_prasad@dell.com> --- drivers/video/fbdev/efifb.c | 158 +++++++++++++++++++++++--------------------- 1 file changed, 84 insertions(+), 74 deletions(-) @@ -74,13 +74,11 @@ unsigned green, + red >>= 8; green >>= 8; - blue >>= 8; -- ((u32 *)(info->pseudo_palette))[regno] = -- (red << info->var.red.offset) | +- ((u32 *)(info->pseudo_palette))[regno] - (red << info->var.red.offset) | - (green << info->var.green.offset) | - (blue << info->var.blue.offset); + blue >>= 8; -+ ((u32 *) (info->pseudo_palette))[regno] = -+ (red << info->var.red.offset) | ++ ((u32 *) (info->pseudo_palette))[regno] + (red << info->var.red.offset) | + (green << info->var.green.offset) | + (blue << info->var.blue.offset); } @@ -117,46 +115,30 @@ unsigned green, if (efifb_dmi_list[i].base != 0 && - !strcmp(this_opt, efifb_dmi_list[i].optname)) { -- screen_info.lfb_base = -efifb_dmi_list[i].base; -- screen_info.lfb_linelength = -efifb_dmi_list[i].stride; -- screen_info.lfb_width = -efifb_dmi_list[i].width; -- screen_info.lfb_height = -efifb_dmi_list[i].height; +- screen_info.lfb_base efifb_dmi_list[i].base; +- screen_info.lfb_linelength efifb_dmi_list[i].stride; +- screen_info.lfb_width efifb_dmi_list[i].width; +- screen_info.lfb_height efifb_dmi_list[i].height; + !strcmp(this_opt, + efifb_dmi_list[i].optname)) { -+ screen_info.lfb_base = -+ efifb_dmi_list[i].base; -+ screen_info.lfb_linelength = -+ efifb_dmi_list[i].stride; -+ screen_info.lfb_width = -+ efifb_dmi_list[i].width; -+ screen_info.lfb_height = -+ efifb_dmi_list[i].height; ++ screen_info.lfb_base + efifb_dmi_list[i].base; ++ screen_info.lfb_linelength + efifb_dmi_list[i].stride; ++ screen_info.lfb_width + efifb_dmi_list[i].width; ++ screen_info.lfb_height + efifb_dmi_list[i].height; } } if (!strncmp(this_opt, "base:", 5)) -- screen_info.lfb_base = -simple_strtoul(this_opt+5, NULL, 0); -+ screen_info.lfb_base = -+ simple_strtoul(this_opt + 5, NULL, 0); +- screen_info.lfb_base simple_strtoul(this_opt+5, NULL, 0); ++ screen_info.lfb_base + simple_strtoul(this_opt + 5, NULL, 0); else if (!strncmp(this_opt, "stride:", 7)) -- screen_info.lfb_linelength = -simple_strtoul(this_opt+7, NULL, 0) * 4; -+ screen_info.lfb_linelength = -+ simple_strtoul(this_opt + 7, NULL, 0) * 4; +- screen_info.lfb_linelength simple_strtoul(this_opt+7, NULL, 0) * 4; ++ screen_info.lfb_linelength + simple_strtoul(this_opt + 7, NULL, 0) * 4; else if (!strncmp(this_opt, "height:", 7)) -- screen_info.lfb_height = -simple_strtoul(this_opt+7, NULL, 0); -+ screen_info.lfb_height = -+ simple_strtoul(this_opt + 7, NULL, 0); +- screen_info.lfb_height simple_strtoul(this_opt+7, NULL, 0); ++ screen_info.lfb_height + simple_strtoul(this_opt + 7, NULL, 0); else if (!strncmp(this_opt, "width:", 6)) -- screen_info.lfb_width = -simple_strtoul(this_opt+6, NULL, 0); -+ screen_info.lfb_width = -+ simple_strtoul(this_opt + 6, NULL, 0); +- screen_info.lfb_width simple_strtoul(this_opt+6, NULL, 0); ++ screen_info.lfb_width + simple_strtoul(this_opt + 6, NULL, 0); } } @@ -206,8 +188,7 @@ simple_strtoul(this_opt+6, NULL, 0); - info->screen_base = ioremap_wc(efifb_fix.smem_start, efifb_fix.smem_len); -+ info->screen_base = -+ ioremap_wc(efifb_fix.smem_start, efifb_fix.smem_len); ++ info->screen_base + ioremap_wc(efifb_fix.smem_start, efifb_fix.smem_len); if (!info->screen_base) { - printk(KERN_ERR "efifb: abort, cannot ioremap video memory " - "0x%x @ 0x%lx\n", diff --git a/a/content_digest b/N1/content_digest index 3d2811d..343e322 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ - "From\0Parmeshwr Prasad <parmeshwr_prasad-8PEkshWhKlo@public.gmane.org>\0" + "From\0Parmeshwr Prasad <parmeshwr_prasad@dell.com>\0" "Subject\0[PATCH] Trivial patch in efifb.c to solve common indent issue and indent error\0" - "Date\0Mon, 9 Feb 2015 07:55:53 -0500\0" + "Date\0Mon, 09 Feb 2015 12:55:53 +0000\0" "To\0pjones-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org" plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org " tomi.valkeinen-l0cyMroinI0@public.gmane.org\0" @@ -18,13 +18,13 @@ "And I have also changed printk with pr_err, pr_info ... at respective places.\n" "\n" "\n" - ">From c49139fac1d15fe2da80d06e2a79eb8be7c079a7 Mon Sep 17 00:00:00 2001\n" - "From: Parmeshwr Prasad <parmeshwr_prasad-8PEkshWhKlo@public.gmane.org>\n" + "From c49139fac1d15fe2da80d06e2a79eb8be7c079a7 Mon Sep 17 00:00:00 2001\n" + "From: Parmeshwr Prasad <parmeshwr_prasad@dell.com>\n" "Date: Mon, 9 Feb 2015 07:33:59 -0500\n" "Subject: [PATCH] Trival patch: improved indentation, and removed some ERROR\n" " from code\n" "\n" - "Signed-off-by: Parmeshwr Prasad <parmeshwr_prasad-8PEkshWhKlo@public.gmane.org>\n" + "Signed-off-by: Parmeshwr Prasad <parmeshwr_prasad@dell.com>\n" "---\n" " drivers/video/fbdev/efifb.c | 158 +++++++++++++++++++++++---------------------\n" " 1 file changed, 84 insertions(+), 74 deletions(-)\n" @@ -85,13 +85,11 @@ "+ red >>= 8;\n" " green >>= 8;\n" "- blue >>= 8;\n" - "- ((u32 *)(info->pseudo_palette))[regno] =\n" - "- (red << info->var.red.offset) |\n" + "- ((u32 *)(info->pseudo_palette))[regno] - (red << info->var.red.offset) |\n" "- (green << info->var.green.offset) |\n" "- (blue << info->var.blue.offset);\n" "+ blue >>= 8;\n" - "+ ((u32 *) (info->pseudo_palette))[regno] =\n" - "+ (red << info->var.red.offset) |\n" + "+ ((u32 *) (info->pseudo_palette))[regno] + (red << info->var.red.offset) |\n" "+ (green << info->var.green.offset) |\n" "+ (blue << info->var.blue.offset);\n" " }\n" @@ -128,46 +126,30 @@ " if (efifb_dmi_list[i].base != 0 &&\n" "- !strcmp(this_opt,\n" "efifb_dmi_list[i].optname)) {\n" - "- screen_info.lfb_base =\n" - "efifb_dmi_list[i].base;\n" - "- screen_info.lfb_linelength =\n" - "efifb_dmi_list[i].stride;\n" - "- screen_info.lfb_width =\n" - "efifb_dmi_list[i].width;\n" - "- screen_info.lfb_height =\n" - "efifb_dmi_list[i].height;\n" + "- screen_info.lfb_base efifb_dmi_list[i].base;\n" + "- screen_info.lfb_linelength efifb_dmi_list[i].stride;\n" + "- screen_info.lfb_width efifb_dmi_list[i].width;\n" + "- screen_info.lfb_height efifb_dmi_list[i].height;\n" "+ !strcmp(this_opt,\n" "+ efifb_dmi_list[i].optname)) {\n" - "+ screen_info.lfb_base =\n" - "+ efifb_dmi_list[i].base;\n" - "+ screen_info.lfb_linelength =\n" - "+ efifb_dmi_list[i].stride;\n" - "+ screen_info.lfb_width =\n" - "+ efifb_dmi_list[i].width;\n" - "+ screen_info.lfb_height =\n" - "+ efifb_dmi_list[i].height;\n" + "+ screen_info.lfb_base + efifb_dmi_list[i].base;\n" + "+ screen_info.lfb_linelength + efifb_dmi_list[i].stride;\n" + "+ screen_info.lfb_width + efifb_dmi_list[i].width;\n" + "+ screen_info.lfb_height + efifb_dmi_list[i].height;\n" " }\n" " }\n" " if (!strncmp(this_opt, \"base:\", 5))\n" - "- screen_info.lfb_base =\n" - "simple_strtoul(this_opt+5, NULL, 0);\n" - "+ screen_info.lfb_base =\n" - "+ simple_strtoul(this_opt + 5, NULL, 0);\n" + "- screen_info.lfb_base simple_strtoul(this_opt+5, NULL, 0);\n" + "+ screen_info.lfb_base + simple_strtoul(this_opt + 5, NULL, 0);\n" " else if (!strncmp(this_opt, \"stride:\", 7))\n" - "- screen_info.lfb_linelength =\n" - "simple_strtoul(this_opt+7, NULL, 0) * 4;\n" - "+ screen_info.lfb_linelength =\n" - "+ simple_strtoul(this_opt + 7, NULL, 0) * 4;\n" + "- screen_info.lfb_linelength simple_strtoul(this_opt+7, NULL, 0) * 4;\n" + "+ screen_info.lfb_linelength + simple_strtoul(this_opt + 7, NULL, 0) * 4;\n" " else if (!strncmp(this_opt, \"height:\", 7))\n" - "- screen_info.lfb_height =\n" - "simple_strtoul(this_opt+7, NULL, 0);\n" - "+ screen_info.lfb_height =\n" - "+ simple_strtoul(this_opt + 7, NULL, 0);\n" + "- screen_info.lfb_height simple_strtoul(this_opt+7, NULL, 0);\n" + "+ screen_info.lfb_height + simple_strtoul(this_opt + 7, NULL, 0);\n" " else if (!strncmp(this_opt, \"width:\", 6))\n" - "- screen_info.lfb_width =\n" - "simple_strtoul(this_opt+6, NULL, 0);\n" - "+ screen_info.lfb_width =\n" - "+ simple_strtoul(this_opt + 6, NULL, 0);\n" + "- screen_info.lfb_width simple_strtoul(this_opt+6, NULL, 0);\n" + "+ screen_info.lfb_width + simple_strtoul(this_opt + 6, NULL, 0);\n" " }\n" " }\n" "\n" @@ -217,8 +199,7 @@ "\n" "- info->screen_base = ioremap_wc(efifb_fix.smem_start,\n" "efifb_fix.smem_len);\n" - "+ info->screen_base =\n" - "+ ioremap_wc(efifb_fix.smem_start, efifb_fix.smem_len);\n" + "+ info->screen_base + ioremap_wc(efifb_fix.smem_start, efifb_fix.smem_len);\n" " if (!info->screen_base) {\n" "- printk(KERN_ERR \"efifb: abort, cannot ioremap video memory \"\n" "- \"0x%x @ 0x%lx\\n\",\n" @@ -327,4 +308,4 @@ "--\n" 1.9.3 -7c0656d65862f7d58c22638e1f23ef5743aecd838fc4e7be437d26cfc05660bb +386a54178726cc2ac3150116ce60dce880dcf618802bc1378ec983aa041c9b75
diff --git a/a/1.txt b/N2/1.txt index c20e003..59d62d6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -8,12 +8,12 @@ And I have also changed printk with pr_err, pr_info ... at respective places. >From c49139fac1d15fe2da80d06e2a79eb8be7c079a7 Mon Sep 17 00:00:00 2001 -From: Parmeshwr Prasad <parmeshwr_prasad-8PEkshWhKlo@public.gmane.org> +From: Parmeshwr Prasad <parmeshwr_prasad@dell.com> Date: Mon, 9 Feb 2015 07:33:59 -0500 Subject: [PATCH] Trival patch: improved indentation, and removed some ERROR from code -Signed-off-by: Parmeshwr Prasad <parmeshwr_prasad-8PEkshWhKlo@public.gmane.org> +Signed-off-by: Parmeshwr Prasad <parmeshwr_prasad@dell.com> --- drivers/video/fbdev/efifb.c | 158 +++++++++++++++++++++++--------------------- 1 file changed, 84 insertions(+), 74 deletions(-) diff --git a/a/content_digest b/N2/content_digest index 3d2811d..31a889d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,12 +1,12 @@ - "From\0Parmeshwr Prasad <parmeshwr_prasad-8PEkshWhKlo@public.gmane.org>\0" + "From\0Parmeshwr Prasad <parmeshwr_prasad@dell.com>\0" "Subject\0[PATCH] Trivial patch in efifb.c to solve common indent issue and indent error\0" "Date\0Mon, 9 Feb 2015 07:55:53 -0500\0" - "To\0pjones-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org" - plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org - " tomi.valkeinen-l0cyMroinI0@public.gmane.org\0" - "Cc\0linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "To\0pjones@redhat.com" + plagnioj@jcrosoft.com + " tomi.valkeinen@ti.com\0" + "Cc\0linux-fbdev@vger.kernel.org" + linux-kernel@vger.kernel.org + " linux-efi@vger.kernel.org\0" "\00:1\0" "b\0" "Hi All,\n" @@ -19,12 +19,12 @@ "\n" "\n" ">From c49139fac1d15fe2da80d06e2a79eb8be7c079a7 Mon Sep 17 00:00:00 2001\n" - "From: Parmeshwr Prasad <parmeshwr_prasad-8PEkshWhKlo@public.gmane.org>\n" + "From: Parmeshwr Prasad <parmeshwr_prasad@dell.com>\n" "Date: Mon, 9 Feb 2015 07:33:59 -0500\n" "Subject: [PATCH] Trival patch: improved indentation, and removed some ERROR\n" " from code\n" "\n" - "Signed-off-by: Parmeshwr Prasad <parmeshwr_prasad-8PEkshWhKlo@public.gmane.org>\n" + "Signed-off-by: Parmeshwr Prasad <parmeshwr_prasad@dell.com>\n" "---\n" " drivers/video/fbdev/efifb.c | 158 +++++++++++++++++++++++---------------------\n" " 1 file changed, 84 insertions(+), 74 deletions(-)\n" @@ -327,4 +327,4 @@ "--\n" 1.9.3 -7c0656d65862f7d58c22638e1f23ef5743aecd838fc4e7be437d26cfc05660bb +92473e00431c83f9ae6fde57c555cab412c913fb80c44ed1e2337c9ebad6af55
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.