diff for duplicates of <20150628014203.602549947@telegraphics.com.au> diff --git a/a/1.txt b/N1/1.txt index 6b88140..caf14c0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,7 +19,8 @@ Signed-off-by: Finn Thain <fthain@telegraphics.com.au> 7 files changed, 16 insertions(+), 17 deletions(-) Index: linux/arch/powerpc/kernel/setup_32.c -=================================--- linux.orig/arch/powerpc/kernel/setup_32.c 2015-06-28 11:41:44.000000000 +1000 +=================================================================== +--- linux.orig/arch/powerpc/kernel/setup_32.c 2015-06-28 11:41:44.000000000 +1000 +++ linux/arch/powerpc/kernel/setup_32.c 2015-06-28 11:41:46.000000000 +1000 @@ -170,20 +170,18 @@ __setup("l3cr=", ppc_setup_l3cr); @@ -54,7 +55,8 @@ Index: linux/arch/powerpc/kernel/setup_32.c .sync = ppc_nvram_sync, }; Index: linux/drivers/char/generic_nvram.c -=================================--- linux.orig/drivers/char/generic_nvram.c 2015-06-28 11:41:44.000000000 +1000 +=================================================================== +--- linux.orig/drivers/char/generic_nvram.c 2015-06-28 11:41:44.000000000 +1000 +++ linux/drivers/char/generic_nvram.c 2015-06-28 11:41:46.000000000 +1000 @@ -64,7 +64,7 @@ static ssize_t read_nvram(struct file *f if (*ppos >= nvram_len) @@ -75,44 +77,47 @@ Index: linux/drivers/char/generic_nvram.c *ppos = i; return p - buf; Index: linux/drivers/video/fbdev/controlfb.c -=================================--- linux.orig/drivers/video/fbdev/controlfb.c 2015-06-28 11:41:27.000000000 +1000 +=================================================================== +--- linux.orig/drivers/video/fbdev/controlfb.c 2015-06-28 11:41:27.000000000 +1000 +++ linux/drivers/video/fbdev/controlfb.c 2015-06-28 11:41:46.000000000 +1000 @@ -415,7 +415,7 @@ static int __init init_control(struct fb /* Try to pick a video mode out of NVRAM if we have one. */ #ifdef CONFIG_NVRAM - if (default_cmode = CMODE_NVRAM) { + if (default_cmode == CMODE_NVRAM) { - cmode = nvram_read_byte(NV_CMODE); + cmode = arch_nvram_ops.read_byte(NV_CMODE); if(cmode < CMODE_8 || cmode > CMODE_32) cmode = CMODE_8; } else @@ -423,7 +423,7 @@ static int __init init_control(struct fb - cmodeÞfault_cmode; + cmode=default_cmode; #ifdef CONFIG_NVRAM - if (default_vmode = VMODE_NVRAM) { + if (default_vmode == VMODE_NVRAM) { - vmode = nvram_read_byte(NV_VMODE); + vmode = arch_nvram_ops.read_byte(NV_VMODE); if (vmode < 1 || vmode > VMODE_MAX || control_mac_modes[vmode - 1].m[full] < cmode) { sense = read_control_sense(p); Index: linux/drivers/video/fbdev/matrox/matroxfb_base.c -=================================--- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c 2015-06-28 11:41:41.000000000 +1000 +=================================================================== +--- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c 2015-06-28 11:41:41.000000000 +1000 +++ linux/drivers/video/fbdev/matrox/matroxfb_base.c 2015-06-28 11:41:46.000000000 +1000 @@ -1888,7 +1888,7 @@ static int initMatrox2(struct matrox_fb_ default_vmode = VMODE_640_480_60; #ifdef CONFIG_NVRAM - if (default_cmode = CMODE_NVRAM) + if (default_cmode == CMODE_NVRAM) - default_cmode = nvram_read_byte(NV_CMODE); + default_cmode = arch_nvram_ops.read_byte(NV_CMODE); #endif if (default_cmode < CMODE_8 || default_cmode > CMODE_32) default_cmode = CMODE_8; Index: linux/drivers/video/fbdev/platinumfb.c -=================================--- linux.orig/drivers/video/fbdev/platinumfb.c 2015-06-28 11:41:27.000000000 +1000 +=================================================================== +--- linux.orig/drivers/video/fbdev/platinumfb.c 2015-06-28 11:41:27.000000000 +1000 +++ linux/drivers/video/fbdev/platinumfb.c 2015-06-28 11:41:46.000000000 +1000 @@ -349,7 +349,7 @@ static int platinum_init_fb(struct fb_in printk(KERN_INFO "platinumfb: Monitor sense value = 0x%x, ", sense); - if (default_vmode = VMODE_NVRAM) { + if (default_vmode == VMODE_NVRAM) { #ifdef CONFIG_NVRAM - default_vmode = nvram_read_byte(NV_VMODE); + default_vmode = arch_nvram_ops.read_byte(NV_VMODE); @@ -122,19 +127,20 @@ Index: linux/drivers/video/fbdev/platinumfb.c @@ -362,7 +362,7 @@ static int platinum_init_fb(struct fb_in default_vmode = VMODE_640_480_60; #ifdef CONFIG_NVRAM - if (default_cmode = CMODE_NVRAM) + if (default_cmode == CMODE_NVRAM) - default_cmode = nvram_read_byte(NV_CMODE); + default_cmode = arch_nvram_ops.read_byte(NV_CMODE); #endif if (default_cmode < CMODE_8 || default_cmode > CMODE_32) default_cmode = CMODE_8; Index: linux/drivers/video/fbdev/valkyriefb.c -=================================--- linux.orig/drivers/video/fbdev/valkyriefb.c 2015-06-28 11:41:27.000000000 +1000 +=================================================================== +--- linux.orig/drivers/video/fbdev/valkyriefb.c 2015-06-28 11:41:27.000000000 +1000 +++ linux/drivers/video/fbdev/valkyriefb.c 2015-06-28 11:41:46.000000000 +1000 @@ -287,7 +287,7 @@ static void __init valkyrie_choose_mode( /* Try to pick a video mode out of NVRAM if we have one. */ #if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM) - if (default_vmode = VMODE_NVRAM) { + if (default_vmode == VMODE_NVRAM) { - default_vmode = nvram_read_byte(NV_VMODE); + default_vmode = arch_nvram_ops.read_byte(NV_VMODE); if (default_vmode <= 0 @@ -143,14 +149,15 @@ Index: linux/drivers/video/fbdev/valkyriefb.c @@ -300,7 +300,7 @@ static void __init valkyrie_choose_mode( default_vmode = VMODE_640_480_67; #if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM) - if (default_cmode = CMODE_NVRAM) + if (default_cmode == CMODE_NVRAM) - default_cmode = nvram_read_byte(NV_CMODE); + default_cmode = arch_nvram_ops.read_byte(NV_CMODE); #endif /* Index: linux/drivers/video/fbdev/imsttfb.c -=================================--- linux.orig/drivers/video/fbdev/imsttfb.c 2015-06-28 11:41:27.000000000 +1000 +=================================================================== +--- linux.orig/drivers/video/fbdev/imsttfb.c 2015-06-28 11:41:27.000000000 +1000 +++ linux/drivers/video/fbdev/imsttfb.c 2015-06-28 11:41:46.000000000 +1000 @@ -328,7 +328,6 @@ enum { TVP = 1 @@ -169,13 +176,13 @@ Index: linux/drivers/video/fbdev/imsttfb.c { int vmode = init_vmode, cmode = init_cmode; - if (vmode = -1) { + if (vmode == -1) { - vmode = nvram_read_byte(NV_VMODE); + vmode = arch_nvram_ops.read_byte(NV_VMODE); if (vmode <= 0 || vmode > VMODE_MAX) vmode = VMODE_640_480_67; } - if (cmode = -1) { + if (cmode == -1) { - cmode = nvram_read_byte(NV_CMODE); + cmode = arch_nvram_ops.read_byte(NV_CMODE); if (cmode < CMODE_8 || cmode > CMODE_32) diff --git a/a/content_digest b/N1/content_digest index a2164e5..93b66c9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020150628014159.732792697@telegraphics.com.au\0" "From\0Finn Thain <fthain@telegraphics.com.au>\0" - "Subject\0[RFC v3 16/24] powerpc, fbdev: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram_wri\0" - "Date\0Sun, 28 Jun 2015 01:42:15 +0000\0" + "Subject\0[RFC v3 16/24] powerpc, fbdev: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram_write_byte()\0" + "Date\0Sun, 28 Jun 2015 11:42:15 +1000\0" "To\0linux-kernel@vger.kernel.org" linux-m68k@vger.kernel.org linuxppc-dev@lists.ozlabs.org @@ -14,6 +14,7 @@ Tomi Valkeinen <tomi.valkeinen@ti.com> " linux-fbdev@vger.kernel.org\0" "\00:1\0" + "fn\0ppc32-replace-exported-nvram-functions\0" "b\0" "Make use of arch_nvram_ops in device drivers so that the nvram_*\n" "function exports can be removed.\n" @@ -36,7 +37,8 @@ " 7 files changed, 16 insertions(+), 17 deletions(-)\n" "\n" "Index: linux/arch/powerpc/kernel/setup_32.c\n" - "=================================--- linux.orig/arch/powerpc/kernel/setup_32.c\t2015-06-28 11:41:44.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/arch/powerpc/kernel/setup_32.c\t2015-06-28 11:41:44.000000000 +1000\n" "+++ linux/arch/powerpc/kernel/setup_32.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -170,20 +170,18 @@ __setup(\"l3cr=\", ppc_setup_l3cr);\n" " \n" @@ -71,7 +73,8 @@ " \t.sync = ppc_nvram_sync,\n" " };\n" "Index: linux/drivers/char/generic_nvram.c\n" - "=================================--- linux.orig/drivers/char/generic_nvram.c\t2015-06-28 11:41:44.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/char/generic_nvram.c\t2015-06-28 11:41:44.000000000 +1000\n" "+++ linux/drivers/char/generic_nvram.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -64,7 +64,7 @@ static ssize_t read_nvram(struct file *f\n" " \tif (*ppos >= nvram_len)\n" @@ -92,44 +95,47 @@ " \t*ppos = i;\n" " \treturn p - buf;\n" "Index: linux/drivers/video/fbdev/controlfb.c\n" - "=================================--- linux.orig/drivers/video/fbdev/controlfb.c\t2015-06-28 11:41:27.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/video/fbdev/controlfb.c\t2015-06-28 11:41:27.000000000 +1000\n" "+++ linux/drivers/video/fbdev/controlfb.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -415,7 +415,7 @@ static int __init init_control(struct fb\n" " \t/* Try to pick a video mode out of NVRAM if we have one. */\n" " #ifdef CONFIG_NVRAM\n" - " \tif (default_cmode = CMODE_NVRAM) {\n" + " \tif (default_cmode == CMODE_NVRAM) {\n" "-\t\tcmode = nvram_read_byte(NV_CMODE);\n" "+\t\tcmode = arch_nvram_ops.read_byte(NV_CMODE);\n" " \t\tif(cmode < CMODE_8 || cmode > CMODE_32)\n" " \t\t\tcmode = CMODE_8;\n" " \t} else\n" "@@ -423,7 +423,7 @@ static int __init init_control(struct fb\n" - " \t\tcmode\303\236fault_cmode;\n" + " \t\tcmode=default_cmode;\n" " #ifdef CONFIG_NVRAM\n" - " \tif (default_vmode = VMODE_NVRAM) {\n" + " \tif (default_vmode == VMODE_NVRAM) {\n" "-\t\tvmode = nvram_read_byte(NV_VMODE);\n" "+\t\tvmode = arch_nvram_ops.read_byte(NV_VMODE);\n" " \t\tif (vmode < 1 || vmode > VMODE_MAX ||\n" " \t\t control_mac_modes[vmode - 1].m[full] < cmode) {\n" " \t\t\tsense = read_control_sense(p);\n" "Index: linux/drivers/video/fbdev/matrox/matroxfb_base.c\n" - "=================================--- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c\t2015-06-28 11:41:41.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c\t2015-06-28 11:41:41.000000000 +1000\n" "+++ linux/drivers/video/fbdev/matrox/matroxfb_base.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -1888,7 +1888,7 @@ static int initMatrox2(struct matrox_fb_\n" " \t\t\tdefault_vmode = VMODE_640_480_60;\n" " #ifdef CONFIG_NVRAM\n" - " \t\tif (default_cmode = CMODE_NVRAM)\n" + " \t\tif (default_cmode == CMODE_NVRAM)\n" "-\t\t\tdefault_cmode = nvram_read_byte(NV_CMODE);\n" "+\t\t\tdefault_cmode = arch_nvram_ops.read_byte(NV_CMODE);\n" " #endif\n" " \t\tif (default_cmode < CMODE_8 || default_cmode > CMODE_32)\n" " \t\t\tdefault_cmode = CMODE_8;\n" "Index: linux/drivers/video/fbdev/platinumfb.c\n" - "=================================--- linux.orig/drivers/video/fbdev/platinumfb.c\t2015-06-28 11:41:27.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/video/fbdev/platinumfb.c\t2015-06-28 11:41:27.000000000 +1000\n" "+++ linux/drivers/video/fbdev/platinumfb.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -349,7 +349,7 @@ static int platinum_init_fb(struct fb_in\n" " \tprintk(KERN_INFO \"platinumfb: Monitor sense value = 0x%x, \", sense);\n" - " \tif (default_vmode = VMODE_NVRAM) {\n" + " \tif (default_vmode == VMODE_NVRAM) {\n" " #ifdef CONFIG_NVRAM\n" "-\t\tdefault_vmode = nvram_read_byte(NV_VMODE);\n" "+\t\tdefault_vmode = arch_nvram_ops.read_byte(NV_VMODE);\n" @@ -139,19 +145,20 @@ "@@ -362,7 +362,7 @@ static int platinum_init_fb(struct fb_in\n" " \t\tdefault_vmode = VMODE_640_480_60;\n" " #ifdef CONFIG_NVRAM\n" - " \tif (default_cmode = CMODE_NVRAM)\n" + " \tif (default_cmode == CMODE_NVRAM)\n" "-\t\tdefault_cmode = nvram_read_byte(NV_CMODE);\n" "+\t\tdefault_cmode = arch_nvram_ops.read_byte(NV_CMODE);\n" " #endif\n" " \tif (default_cmode < CMODE_8 || default_cmode > CMODE_32)\n" " \t\tdefault_cmode = CMODE_8;\n" "Index: linux/drivers/video/fbdev/valkyriefb.c\n" - "=================================--- linux.orig/drivers/video/fbdev/valkyriefb.c\t2015-06-28 11:41:27.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/video/fbdev/valkyriefb.c\t2015-06-28 11:41:27.000000000 +1000\n" "+++ linux/drivers/video/fbdev/valkyriefb.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -287,7 +287,7 @@ static void __init valkyrie_choose_mode(\n" " \t/* Try to pick a video mode out of NVRAM if we have one. */\n" " #if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM)\n" - " \tif (default_vmode = VMODE_NVRAM) {\n" + " \tif (default_vmode == VMODE_NVRAM) {\n" "-\t\tdefault_vmode = nvram_read_byte(NV_VMODE);\n" "+\t\tdefault_vmode = arch_nvram_ops.read_byte(NV_VMODE);\n" " \t\tif (default_vmode <= 0\n" @@ -160,14 +167,15 @@ "@@ -300,7 +300,7 @@ static void __init valkyrie_choose_mode(\n" " \t\tdefault_vmode = VMODE_640_480_67;\n" " #if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM)\n" - " \tif (default_cmode = CMODE_NVRAM)\n" + " \tif (default_cmode == CMODE_NVRAM)\n" "-\t\tdefault_cmode = nvram_read_byte(NV_CMODE);\n" "+\t\tdefault_cmode = arch_nvram_ops.read_byte(NV_CMODE);\n" " #endif\n" " \n" " \t/*\n" "Index: linux/drivers/video/fbdev/imsttfb.c\n" - "=================================--- linux.orig/drivers/video/fbdev/imsttfb.c\t2015-06-28 11:41:27.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/video/fbdev/imsttfb.c\t2015-06-28 11:41:27.000000000 +1000\n" "+++ linux/drivers/video/fbdev/imsttfb.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -328,7 +328,6 @@ enum {\n" " \tTVP = 1\n" @@ -186,17 +194,17 @@ " \t{\n" " \t\tint vmode = init_vmode, cmode = init_cmode;\n" " \n" - " \t\tif (vmode = -1) {\n" + " \t\tif (vmode == -1) {\n" "-\t\t\tvmode = nvram_read_byte(NV_VMODE);\n" "+\t\t\tvmode = arch_nvram_ops.read_byte(NV_VMODE);\n" " \t\t\tif (vmode <= 0 || vmode > VMODE_MAX)\n" " \t\t\t\tvmode = VMODE_640_480_67;\n" " \t\t}\n" - " \t\tif (cmode = -1) {\n" + " \t\tif (cmode == -1) {\n" "-\t\t\tcmode = nvram_read_byte(NV_CMODE);\n" "+\t\t\tcmode = arch_nvram_ops.read_byte(NV_CMODE);\n" " \t\t\tif (cmode < CMODE_8 || cmode > CMODE_32)\n" " \t\t\t\tcmode = CMODE_8;\n" " \t\t}" -ff61bbe5e418b5a6cecd4a97e3e31891d2237318b9fb409b00c3549183253a11 +625ae67f16bf70a00bd31c55db55a9f03f8d65e578b49e81b8923102263d9969
diff --git a/a/1.txt b/N2/1.txt index 6b88140..caf14c0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -19,7 +19,8 @@ Signed-off-by: Finn Thain <fthain@telegraphics.com.au> 7 files changed, 16 insertions(+), 17 deletions(-) Index: linux/arch/powerpc/kernel/setup_32.c -=================================--- linux.orig/arch/powerpc/kernel/setup_32.c 2015-06-28 11:41:44.000000000 +1000 +=================================================================== +--- linux.orig/arch/powerpc/kernel/setup_32.c 2015-06-28 11:41:44.000000000 +1000 +++ linux/arch/powerpc/kernel/setup_32.c 2015-06-28 11:41:46.000000000 +1000 @@ -170,20 +170,18 @@ __setup("l3cr=", ppc_setup_l3cr); @@ -54,7 +55,8 @@ Index: linux/arch/powerpc/kernel/setup_32.c .sync = ppc_nvram_sync, }; Index: linux/drivers/char/generic_nvram.c -=================================--- linux.orig/drivers/char/generic_nvram.c 2015-06-28 11:41:44.000000000 +1000 +=================================================================== +--- linux.orig/drivers/char/generic_nvram.c 2015-06-28 11:41:44.000000000 +1000 +++ linux/drivers/char/generic_nvram.c 2015-06-28 11:41:46.000000000 +1000 @@ -64,7 +64,7 @@ static ssize_t read_nvram(struct file *f if (*ppos >= nvram_len) @@ -75,44 +77,47 @@ Index: linux/drivers/char/generic_nvram.c *ppos = i; return p - buf; Index: linux/drivers/video/fbdev/controlfb.c -=================================--- linux.orig/drivers/video/fbdev/controlfb.c 2015-06-28 11:41:27.000000000 +1000 +=================================================================== +--- linux.orig/drivers/video/fbdev/controlfb.c 2015-06-28 11:41:27.000000000 +1000 +++ linux/drivers/video/fbdev/controlfb.c 2015-06-28 11:41:46.000000000 +1000 @@ -415,7 +415,7 @@ static int __init init_control(struct fb /* Try to pick a video mode out of NVRAM if we have one. */ #ifdef CONFIG_NVRAM - if (default_cmode = CMODE_NVRAM) { + if (default_cmode == CMODE_NVRAM) { - cmode = nvram_read_byte(NV_CMODE); + cmode = arch_nvram_ops.read_byte(NV_CMODE); if(cmode < CMODE_8 || cmode > CMODE_32) cmode = CMODE_8; } else @@ -423,7 +423,7 @@ static int __init init_control(struct fb - cmodeÞfault_cmode; + cmode=default_cmode; #ifdef CONFIG_NVRAM - if (default_vmode = VMODE_NVRAM) { + if (default_vmode == VMODE_NVRAM) { - vmode = nvram_read_byte(NV_VMODE); + vmode = arch_nvram_ops.read_byte(NV_VMODE); if (vmode < 1 || vmode > VMODE_MAX || control_mac_modes[vmode - 1].m[full] < cmode) { sense = read_control_sense(p); Index: linux/drivers/video/fbdev/matrox/matroxfb_base.c -=================================--- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c 2015-06-28 11:41:41.000000000 +1000 +=================================================================== +--- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c 2015-06-28 11:41:41.000000000 +1000 +++ linux/drivers/video/fbdev/matrox/matroxfb_base.c 2015-06-28 11:41:46.000000000 +1000 @@ -1888,7 +1888,7 @@ static int initMatrox2(struct matrox_fb_ default_vmode = VMODE_640_480_60; #ifdef CONFIG_NVRAM - if (default_cmode = CMODE_NVRAM) + if (default_cmode == CMODE_NVRAM) - default_cmode = nvram_read_byte(NV_CMODE); + default_cmode = arch_nvram_ops.read_byte(NV_CMODE); #endif if (default_cmode < CMODE_8 || default_cmode > CMODE_32) default_cmode = CMODE_8; Index: linux/drivers/video/fbdev/platinumfb.c -=================================--- linux.orig/drivers/video/fbdev/platinumfb.c 2015-06-28 11:41:27.000000000 +1000 +=================================================================== +--- linux.orig/drivers/video/fbdev/platinumfb.c 2015-06-28 11:41:27.000000000 +1000 +++ linux/drivers/video/fbdev/platinumfb.c 2015-06-28 11:41:46.000000000 +1000 @@ -349,7 +349,7 @@ static int platinum_init_fb(struct fb_in printk(KERN_INFO "platinumfb: Monitor sense value = 0x%x, ", sense); - if (default_vmode = VMODE_NVRAM) { + if (default_vmode == VMODE_NVRAM) { #ifdef CONFIG_NVRAM - default_vmode = nvram_read_byte(NV_VMODE); + default_vmode = arch_nvram_ops.read_byte(NV_VMODE); @@ -122,19 +127,20 @@ Index: linux/drivers/video/fbdev/platinumfb.c @@ -362,7 +362,7 @@ static int platinum_init_fb(struct fb_in default_vmode = VMODE_640_480_60; #ifdef CONFIG_NVRAM - if (default_cmode = CMODE_NVRAM) + if (default_cmode == CMODE_NVRAM) - default_cmode = nvram_read_byte(NV_CMODE); + default_cmode = arch_nvram_ops.read_byte(NV_CMODE); #endif if (default_cmode < CMODE_8 || default_cmode > CMODE_32) default_cmode = CMODE_8; Index: linux/drivers/video/fbdev/valkyriefb.c -=================================--- linux.orig/drivers/video/fbdev/valkyriefb.c 2015-06-28 11:41:27.000000000 +1000 +=================================================================== +--- linux.orig/drivers/video/fbdev/valkyriefb.c 2015-06-28 11:41:27.000000000 +1000 +++ linux/drivers/video/fbdev/valkyriefb.c 2015-06-28 11:41:46.000000000 +1000 @@ -287,7 +287,7 @@ static void __init valkyrie_choose_mode( /* Try to pick a video mode out of NVRAM if we have one. */ #if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM) - if (default_vmode = VMODE_NVRAM) { + if (default_vmode == VMODE_NVRAM) { - default_vmode = nvram_read_byte(NV_VMODE); + default_vmode = arch_nvram_ops.read_byte(NV_VMODE); if (default_vmode <= 0 @@ -143,14 +149,15 @@ Index: linux/drivers/video/fbdev/valkyriefb.c @@ -300,7 +300,7 @@ static void __init valkyrie_choose_mode( default_vmode = VMODE_640_480_67; #if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM) - if (default_cmode = CMODE_NVRAM) + if (default_cmode == CMODE_NVRAM) - default_cmode = nvram_read_byte(NV_CMODE); + default_cmode = arch_nvram_ops.read_byte(NV_CMODE); #endif /* Index: linux/drivers/video/fbdev/imsttfb.c -=================================--- linux.orig/drivers/video/fbdev/imsttfb.c 2015-06-28 11:41:27.000000000 +1000 +=================================================================== +--- linux.orig/drivers/video/fbdev/imsttfb.c 2015-06-28 11:41:27.000000000 +1000 +++ linux/drivers/video/fbdev/imsttfb.c 2015-06-28 11:41:46.000000000 +1000 @@ -328,7 +328,6 @@ enum { TVP = 1 @@ -169,13 +176,13 @@ Index: linux/drivers/video/fbdev/imsttfb.c { int vmode = init_vmode, cmode = init_cmode; - if (vmode = -1) { + if (vmode == -1) { - vmode = nvram_read_byte(NV_VMODE); + vmode = arch_nvram_ops.read_byte(NV_VMODE); if (vmode <= 0 || vmode > VMODE_MAX) vmode = VMODE_640_480_67; } - if (cmode = -1) { + if (cmode == -1) { - cmode = nvram_read_byte(NV_CMODE); + cmode = arch_nvram_ops.read_byte(NV_CMODE); if (cmode < CMODE_8 || cmode > CMODE_32) diff --git a/a/content_digest b/N2/content_digest index a2164e5..259364a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,10 @@ "ref\020150628014159.732792697@telegraphics.com.au\0" "From\0Finn Thain <fthain@telegraphics.com.au>\0" - "Subject\0[RFC v3 16/24] powerpc, fbdev: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram_wri\0" - "Date\0Sun, 28 Jun 2015 01:42:15 +0000\0" - "To\0linux-kernel@vger.kernel.org" - linux-m68k@vger.kernel.org - linuxppc-dev@lists.ozlabs.org + "Subject\0[RFC v3 16/24] powerpc, fbdev: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram_write_byte()\0" + "Date\0Sun, 28 Jun 2015 11:42:15 +1000\0" + "To\0<linux-kernel@vger.kernel.org>" + <linux-m68k@vger.kernel.org> + <linuxppc-dev@lists.ozlabs.org> Benjamin Herrenschmidt <benh@kernel.crashing.org> Paul Mackerras <paulus@samba.org> Michael Ellerman <mpe@ellerman.id.au> @@ -36,7 +36,8 @@ " 7 files changed, 16 insertions(+), 17 deletions(-)\n" "\n" "Index: linux/arch/powerpc/kernel/setup_32.c\n" - "=================================--- linux.orig/arch/powerpc/kernel/setup_32.c\t2015-06-28 11:41:44.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/arch/powerpc/kernel/setup_32.c\t2015-06-28 11:41:44.000000000 +1000\n" "+++ linux/arch/powerpc/kernel/setup_32.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -170,20 +170,18 @@ __setup(\"l3cr=\", ppc_setup_l3cr);\n" " \n" @@ -71,7 +72,8 @@ " \t.sync = ppc_nvram_sync,\n" " };\n" "Index: linux/drivers/char/generic_nvram.c\n" - "=================================--- linux.orig/drivers/char/generic_nvram.c\t2015-06-28 11:41:44.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/char/generic_nvram.c\t2015-06-28 11:41:44.000000000 +1000\n" "+++ linux/drivers/char/generic_nvram.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -64,7 +64,7 @@ static ssize_t read_nvram(struct file *f\n" " \tif (*ppos >= nvram_len)\n" @@ -92,44 +94,47 @@ " \t*ppos = i;\n" " \treturn p - buf;\n" "Index: linux/drivers/video/fbdev/controlfb.c\n" - "=================================--- linux.orig/drivers/video/fbdev/controlfb.c\t2015-06-28 11:41:27.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/video/fbdev/controlfb.c\t2015-06-28 11:41:27.000000000 +1000\n" "+++ linux/drivers/video/fbdev/controlfb.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -415,7 +415,7 @@ static int __init init_control(struct fb\n" " \t/* Try to pick a video mode out of NVRAM if we have one. */\n" " #ifdef CONFIG_NVRAM\n" - " \tif (default_cmode = CMODE_NVRAM) {\n" + " \tif (default_cmode == CMODE_NVRAM) {\n" "-\t\tcmode = nvram_read_byte(NV_CMODE);\n" "+\t\tcmode = arch_nvram_ops.read_byte(NV_CMODE);\n" " \t\tif(cmode < CMODE_8 || cmode > CMODE_32)\n" " \t\t\tcmode = CMODE_8;\n" " \t} else\n" "@@ -423,7 +423,7 @@ static int __init init_control(struct fb\n" - " \t\tcmode\303\236fault_cmode;\n" + " \t\tcmode=default_cmode;\n" " #ifdef CONFIG_NVRAM\n" - " \tif (default_vmode = VMODE_NVRAM) {\n" + " \tif (default_vmode == VMODE_NVRAM) {\n" "-\t\tvmode = nvram_read_byte(NV_VMODE);\n" "+\t\tvmode = arch_nvram_ops.read_byte(NV_VMODE);\n" " \t\tif (vmode < 1 || vmode > VMODE_MAX ||\n" " \t\t control_mac_modes[vmode - 1].m[full] < cmode) {\n" " \t\t\tsense = read_control_sense(p);\n" "Index: linux/drivers/video/fbdev/matrox/matroxfb_base.c\n" - "=================================--- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c\t2015-06-28 11:41:41.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c\t2015-06-28 11:41:41.000000000 +1000\n" "+++ linux/drivers/video/fbdev/matrox/matroxfb_base.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -1888,7 +1888,7 @@ static int initMatrox2(struct matrox_fb_\n" " \t\t\tdefault_vmode = VMODE_640_480_60;\n" " #ifdef CONFIG_NVRAM\n" - " \t\tif (default_cmode = CMODE_NVRAM)\n" + " \t\tif (default_cmode == CMODE_NVRAM)\n" "-\t\t\tdefault_cmode = nvram_read_byte(NV_CMODE);\n" "+\t\t\tdefault_cmode = arch_nvram_ops.read_byte(NV_CMODE);\n" " #endif\n" " \t\tif (default_cmode < CMODE_8 || default_cmode > CMODE_32)\n" " \t\t\tdefault_cmode = CMODE_8;\n" "Index: linux/drivers/video/fbdev/platinumfb.c\n" - "=================================--- linux.orig/drivers/video/fbdev/platinumfb.c\t2015-06-28 11:41:27.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/video/fbdev/platinumfb.c\t2015-06-28 11:41:27.000000000 +1000\n" "+++ linux/drivers/video/fbdev/platinumfb.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -349,7 +349,7 @@ static int platinum_init_fb(struct fb_in\n" " \tprintk(KERN_INFO \"platinumfb: Monitor sense value = 0x%x, \", sense);\n" - " \tif (default_vmode = VMODE_NVRAM) {\n" + " \tif (default_vmode == VMODE_NVRAM) {\n" " #ifdef CONFIG_NVRAM\n" "-\t\tdefault_vmode = nvram_read_byte(NV_VMODE);\n" "+\t\tdefault_vmode = arch_nvram_ops.read_byte(NV_VMODE);\n" @@ -139,19 +144,20 @@ "@@ -362,7 +362,7 @@ static int platinum_init_fb(struct fb_in\n" " \t\tdefault_vmode = VMODE_640_480_60;\n" " #ifdef CONFIG_NVRAM\n" - " \tif (default_cmode = CMODE_NVRAM)\n" + " \tif (default_cmode == CMODE_NVRAM)\n" "-\t\tdefault_cmode = nvram_read_byte(NV_CMODE);\n" "+\t\tdefault_cmode = arch_nvram_ops.read_byte(NV_CMODE);\n" " #endif\n" " \tif (default_cmode < CMODE_8 || default_cmode > CMODE_32)\n" " \t\tdefault_cmode = CMODE_8;\n" "Index: linux/drivers/video/fbdev/valkyriefb.c\n" - "=================================--- linux.orig/drivers/video/fbdev/valkyriefb.c\t2015-06-28 11:41:27.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/video/fbdev/valkyriefb.c\t2015-06-28 11:41:27.000000000 +1000\n" "+++ linux/drivers/video/fbdev/valkyriefb.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -287,7 +287,7 @@ static void __init valkyrie_choose_mode(\n" " \t/* Try to pick a video mode out of NVRAM if we have one. */\n" " #if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM)\n" - " \tif (default_vmode = VMODE_NVRAM) {\n" + " \tif (default_vmode == VMODE_NVRAM) {\n" "-\t\tdefault_vmode = nvram_read_byte(NV_VMODE);\n" "+\t\tdefault_vmode = arch_nvram_ops.read_byte(NV_VMODE);\n" " \t\tif (default_vmode <= 0\n" @@ -160,14 +166,15 @@ "@@ -300,7 +300,7 @@ static void __init valkyrie_choose_mode(\n" " \t\tdefault_vmode = VMODE_640_480_67;\n" " #if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM)\n" - " \tif (default_cmode = CMODE_NVRAM)\n" + " \tif (default_cmode == CMODE_NVRAM)\n" "-\t\tdefault_cmode = nvram_read_byte(NV_CMODE);\n" "+\t\tdefault_cmode = arch_nvram_ops.read_byte(NV_CMODE);\n" " #endif\n" " \n" " \t/*\n" "Index: linux/drivers/video/fbdev/imsttfb.c\n" - "=================================--- linux.orig/drivers/video/fbdev/imsttfb.c\t2015-06-28 11:41:27.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/video/fbdev/imsttfb.c\t2015-06-28 11:41:27.000000000 +1000\n" "+++ linux/drivers/video/fbdev/imsttfb.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -328,7 +328,6 @@ enum {\n" " \tTVP = 1\n" @@ -186,17 +193,17 @@ " \t{\n" " \t\tint vmode = init_vmode, cmode = init_cmode;\n" " \n" - " \t\tif (vmode = -1) {\n" + " \t\tif (vmode == -1) {\n" "-\t\t\tvmode = nvram_read_byte(NV_VMODE);\n" "+\t\t\tvmode = arch_nvram_ops.read_byte(NV_VMODE);\n" " \t\t\tif (vmode <= 0 || vmode > VMODE_MAX)\n" " \t\t\t\tvmode = VMODE_640_480_67;\n" " \t\t}\n" - " \t\tif (cmode = -1) {\n" + " \t\tif (cmode == -1) {\n" "-\t\t\tcmode = nvram_read_byte(NV_CMODE);\n" "+\t\t\tcmode = arch_nvram_ops.read_byte(NV_CMODE);\n" " \t\t\tif (cmode < CMODE_8 || cmode > CMODE_32)\n" " \t\t\t\tcmode = CMODE_8;\n" " \t\t}" -ff61bbe5e418b5a6cecd4a97e3e31891d2237318b9fb409b00c3549183253a11 +28d449ebb9dd921137f5ec4c0724f743a1fe1c7cd4d461fb33aa7676e5dccf2e
diff --git a/a/1.txt b/N3/1.txt index 6b88140..caf14c0 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -19,7 +19,8 @@ Signed-off-by: Finn Thain <fthain@telegraphics.com.au> 7 files changed, 16 insertions(+), 17 deletions(-) Index: linux/arch/powerpc/kernel/setup_32.c -=================================--- linux.orig/arch/powerpc/kernel/setup_32.c 2015-06-28 11:41:44.000000000 +1000 +=================================================================== +--- linux.orig/arch/powerpc/kernel/setup_32.c 2015-06-28 11:41:44.000000000 +1000 +++ linux/arch/powerpc/kernel/setup_32.c 2015-06-28 11:41:46.000000000 +1000 @@ -170,20 +170,18 @@ __setup("l3cr=", ppc_setup_l3cr); @@ -54,7 +55,8 @@ Index: linux/arch/powerpc/kernel/setup_32.c .sync = ppc_nvram_sync, }; Index: linux/drivers/char/generic_nvram.c -=================================--- linux.orig/drivers/char/generic_nvram.c 2015-06-28 11:41:44.000000000 +1000 +=================================================================== +--- linux.orig/drivers/char/generic_nvram.c 2015-06-28 11:41:44.000000000 +1000 +++ linux/drivers/char/generic_nvram.c 2015-06-28 11:41:46.000000000 +1000 @@ -64,7 +64,7 @@ static ssize_t read_nvram(struct file *f if (*ppos >= nvram_len) @@ -75,44 +77,47 @@ Index: linux/drivers/char/generic_nvram.c *ppos = i; return p - buf; Index: linux/drivers/video/fbdev/controlfb.c -=================================--- linux.orig/drivers/video/fbdev/controlfb.c 2015-06-28 11:41:27.000000000 +1000 +=================================================================== +--- linux.orig/drivers/video/fbdev/controlfb.c 2015-06-28 11:41:27.000000000 +1000 +++ linux/drivers/video/fbdev/controlfb.c 2015-06-28 11:41:46.000000000 +1000 @@ -415,7 +415,7 @@ static int __init init_control(struct fb /* Try to pick a video mode out of NVRAM if we have one. */ #ifdef CONFIG_NVRAM - if (default_cmode = CMODE_NVRAM) { + if (default_cmode == CMODE_NVRAM) { - cmode = nvram_read_byte(NV_CMODE); + cmode = arch_nvram_ops.read_byte(NV_CMODE); if(cmode < CMODE_8 || cmode > CMODE_32) cmode = CMODE_8; } else @@ -423,7 +423,7 @@ static int __init init_control(struct fb - cmodeÞfault_cmode; + cmode=default_cmode; #ifdef CONFIG_NVRAM - if (default_vmode = VMODE_NVRAM) { + if (default_vmode == VMODE_NVRAM) { - vmode = nvram_read_byte(NV_VMODE); + vmode = arch_nvram_ops.read_byte(NV_VMODE); if (vmode < 1 || vmode > VMODE_MAX || control_mac_modes[vmode - 1].m[full] < cmode) { sense = read_control_sense(p); Index: linux/drivers/video/fbdev/matrox/matroxfb_base.c -=================================--- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c 2015-06-28 11:41:41.000000000 +1000 +=================================================================== +--- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c 2015-06-28 11:41:41.000000000 +1000 +++ linux/drivers/video/fbdev/matrox/matroxfb_base.c 2015-06-28 11:41:46.000000000 +1000 @@ -1888,7 +1888,7 @@ static int initMatrox2(struct matrox_fb_ default_vmode = VMODE_640_480_60; #ifdef CONFIG_NVRAM - if (default_cmode = CMODE_NVRAM) + if (default_cmode == CMODE_NVRAM) - default_cmode = nvram_read_byte(NV_CMODE); + default_cmode = arch_nvram_ops.read_byte(NV_CMODE); #endif if (default_cmode < CMODE_8 || default_cmode > CMODE_32) default_cmode = CMODE_8; Index: linux/drivers/video/fbdev/platinumfb.c -=================================--- linux.orig/drivers/video/fbdev/platinumfb.c 2015-06-28 11:41:27.000000000 +1000 +=================================================================== +--- linux.orig/drivers/video/fbdev/platinumfb.c 2015-06-28 11:41:27.000000000 +1000 +++ linux/drivers/video/fbdev/platinumfb.c 2015-06-28 11:41:46.000000000 +1000 @@ -349,7 +349,7 @@ static int platinum_init_fb(struct fb_in printk(KERN_INFO "platinumfb: Monitor sense value = 0x%x, ", sense); - if (default_vmode = VMODE_NVRAM) { + if (default_vmode == VMODE_NVRAM) { #ifdef CONFIG_NVRAM - default_vmode = nvram_read_byte(NV_VMODE); + default_vmode = arch_nvram_ops.read_byte(NV_VMODE); @@ -122,19 +127,20 @@ Index: linux/drivers/video/fbdev/platinumfb.c @@ -362,7 +362,7 @@ static int platinum_init_fb(struct fb_in default_vmode = VMODE_640_480_60; #ifdef CONFIG_NVRAM - if (default_cmode = CMODE_NVRAM) + if (default_cmode == CMODE_NVRAM) - default_cmode = nvram_read_byte(NV_CMODE); + default_cmode = arch_nvram_ops.read_byte(NV_CMODE); #endif if (default_cmode < CMODE_8 || default_cmode > CMODE_32) default_cmode = CMODE_8; Index: linux/drivers/video/fbdev/valkyriefb.c -=================================--- linux.orig/drivers/video/fbdev/valkyriefb.c 2015-06-28 11:41:27.000000000 +1000 +=================================================================== +--- linux.orig/drivers/video/fbdev/valkyriefb.c 2015-06-28 11:41:27.000000000 +1000 +++ linux/drivers/video/fbdev/valkyriefb.c 2015-06-28 11:41:46.000000000 +1000 @@ -287,7 +287,7 @@ static void __init valkyrie_choose_mode( /* Try to pick a video mode out of NVRAM if we have one. */ #if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM) - if (default_vmode = VMODE_NVRAM) { + if (default_vmode == VMODE_NVRAM) { - default_vmode = nvram_read_byte(NV_VMODE); + default_vmode = arch_nvram_ops.read_byte(NV_VMODE); if (default_vmode <= 0 @@ -143,14 +149,15 @@ Index: linux/drivers/video/fbdev/valkyriefb.c @@ -300,7 +300,7 @@ static void __init valkyrie_choose_mode( default_vmode = VMODE_640_480_67; #if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM) - if (default_cmode = CMODE_NVRAM) + if (default_cmode == CMODE_NVRAM) - default_cmode = nvram_read_byte(NV_CMODE); + default_cmode = arch_nvram_ops.read_byte(NV_CMODE); #endif /* Index: linux/drivers/video/fbdev/imsttfb.c -=================================--- linux.orig/drivers/video/fbdev/imsttfb.c 2015-06-28 11:41:27.000000000 +1000 +=================================================================== +--- linux.orig/drivers/video/fbdev/imsttfb.c 2015-06-28 11:41:27.000000000 +1000 +++ linux/drivers/video/fbdev/imsttfb.c 2015-06-28 11:41:46.000000000 +1000 @@ -328,7 +328,6 @@ enum { TVP = 1 @@ -169,13 +176,13 @@ Index: linux/drivers/video/fbdev/imsttfb.c { int vmode = init_vmode, cmode = init_cmode; - if (vmode = -1) { + if (vmode == -1) { - vmode = nvram_read_byte(NV_VMODE); + vmode = arch_nvram_ops.read_byte(NV_VMODE); if (vmode <= 0 || vmode > VMODE_MAX) vmode = VMODE_640_480_67; } - if (cmode = -1) { + if (cmode == -1) { - cmode = nvram_read_byte(NV_CMODE); + cmode = arch_nvram_ops.read_byte(NV_CMODE); if (cmode < CMODE_8 || cmode > CMODE_32) diff --git a/a/content_digest b/N3/content_digest index a2164e5..34280b5 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,10 +1,10 @@ "ref\020150628014159.732792697@telegraphics.com.au\0" "From\0Finn Thain <fthain@telegraphics.com.au>\0" - "Subject\0[RFC v3 16/24] powerpc, fbdev: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram_wri\0" - "Date\0Sun, 28 Jun 2015 01:42:15 +0000\0" - "To\0linux-kernel@vger.kernel.org" - linux-m68k@vger.kernel.org - linuxppc-dev@lists.ozlabs.org + "Subject\0[RFC v3 16/24] powerpc, fbdev: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram_write_byte()\0" + "Date\0Sun, 28 Jun 2015 11:42:15 +1000\0" + "To\0<linux-kernel@vger.kernel.org>" + <linux-m68k@vger.kernel.org> + <linuxppc-dev@lists.ozlabs.org> Benjamin Herrenschmidt <benh@kernel.crashing.org> Paul Mackerras <paulus@samba.org> Michael Ellerman <mpe@ellerman.id.au> @@ -14,6 +14,7 @@ Tomi Valkeinen <tomi.valkeinen@ti.com> " linux-fbdev@vger.kernel.org\0" "\00:1\0" + "fn\0ppc32-replace-exported-nvram-functions\0" "b\0" "Make use of arch_nvram_ops in device drivers so that the nvram_*\n" "function exports can be removed.\n" @@ -36,7 +37,8 @@ " 7 files changed, 16 insertions(+), 17 deletions(-)\n" "\n" "Index: linux/arch/powerpc/kernel/setup_32.c\n" - "=================================--- linux.orig/arch/powerpc/kernel/setup_32.c\t2015-06-28 11:41:44.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/arch/powerpc/kernel/setup_32.c\t2015-06-28 11:41:44.000000000 +1000\n" "+++ linux/arch/powerpc/kernel/setup_32.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -170,20 +170,18 @@ __setup(\"l3cr=\", ppc_setup_l3cr);\n" " \n" @@ -71,7 +73,8 @@ " \t.sync = ppc_nvram_sync,\n" " };\n" "Index: linux/drivers/char/generic_nvram.c\n" - "=================================--- linux.orig/drivers/char/generic_nvram.c\t2015-06-28 11:41:44.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/char/generic_nvram.c\t2015-06-28 11:41:44.000000000 +1000\n" "+++ linux/drivers/char/generic_nvram.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -64,7 +64,7 @@ static ssize_t read_nvram(struct file *f\n" " \tif (*ppos >= nvram_len)\n" @@ -92,44 +95,47 @@ " \t*ppos = i;\n" " \treturn p - buf;\n" "Index: linux/drivers/video/fbdev/controlfb.c\n" - "=================================--- linux.orig/drivers/video/fbdev/controlfb.c\t2015-06-28 11:41:27.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/video/fbdev/controlfb.c\t2015-06-28 11:41:27.000000000 +1000\n" "+++ linux/drivers/video/fbdev/controlfb.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -415,7 +415,7 @@ static int __init init_control(struct fb\n" " \t/* Try to pick a video mode out of NVRAM if we have one. */\n" " #ifdef CONFIG_NVRAM\n" - " \tif (default_cmode = CMODE_NVRAM) {\n" + " \tif (default_cmode == CMODE_NVRAM) {\n" "-\t\tcmode = nvram_read_byte(NV_CMODE);\n" "+\t\tcmode = arch_nvram_ops.read_byte(NV_CMODE);\n" " \t\tif(cmode < CMODE_8 || cmode > CMODE_32)\n" " \t\t\tcmode = CMODE_8;\n" " \t} else\n" "@@ -423,7 +423,7 @@ static int __init init_control(struct fb\n" - " \t\tcmode\303\236fault_cmode;\n" + " \t\tcmode=default_cmode;\n" " #ifdef CONFIG_NVRAM\n" - " \tif (default_vmode = VMODE_NVRAM) {\n" + " \tif (default_vmode == VMODE_NVRAM) {\n" "-\t\tvmode = nvram_read_byte(NV_VMODE);\n" "+\t\tvmode = arch_nvram_ops.read_byte(NV_VMODE);\n" " \t\tif (vmode < 1 || vmode > VMODE_MAX ||\n" " \t\t control_mac_modes[vmode - 1].m[full] < cmode) {\n" " \t\t\tsense = read_control_sense(p);\n" "Index: linux/drivers/video/fbdev/matrox/matroxfb_base.c\n" - "=================================--- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c\t2015-06-28 11:41:41.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c\t2015-06-28 11:41:41.000000000 +1000\n" "+++ linux/drivers/video/fbdev/matrox/matroxfb_base.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -1888,7 +1888,7 @@ static int initMatrox2(struct matrox_fb_\n" " \t\t\tdefault_vmode = VMODE_640_480_60;\n" " #ifdef CONFIG_NVRAM\n" - " \t\tif (default_cmode = CMODE_NVRAM)\n" + " \t\tif (default_cmode == CMODE_NVRAM)\n" "-\t\t\tdefault_cmode = nvram_read_byte(NV_CMODE);\n" "+\t\t\tdefault_cmode = arch_nvram_ops.read_byte(NV_CMODE);\n" " #endif\n" " \t\tif (default_cmode < CMODE_8 || default_cmode > CMODE_32)\n" " \t\t\tdefault_cmode = CMODE_8;\n" "Index: linux/drivers/video/fbdev/platinumfb.c\n" - "=================================--- linux.orig/drivers/video/fbdev/platinumfb.c\t2015-06-28 11:41:27.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/video/fbdev/platinumfb.c\t2015-06-28 11:41:27.000000000 +1000\n" "+++ linux/drivers/video/fbdev/platinumfb.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -349,7 +349,7 @@ static int platinum_init_fb(struct fb_in\n" " \tprintk(KERN_INFO \"platinumfb: Monitor sense value = 0x%x, \", sense);\n" - " \tif (default_vmode = VMODE_NVRAM) {\n" + " \tif (default_vmode == VMODE_NVRAM) {\n" " #ifdef CONFIG_NVRAM\n" "-\t\tdefault_vmode = nvram_read_byte(NV_VMODE);\n" "+\t\tdefault_vmode = arch_nvram_ops.read_byte(NV_VMODE);\n" @@ -139,19 +145,20 @@ "@@ -362,7 +362,7 @@ static int platinum_init_fb(struct fb_in\n" " \t\tdefault_vmode = VMODE_640_480_60;\n" " #ifdef CONFIG_NVRAM\n" - " \tif (default_cmode = CMODE_NVRAM)\n" + " \tif (default_cmode == CMODE_NVRAM)\n" "-\t\tdefault_cmode = nvram_read_byte(NV_CMODE);\n" "+\t\tdefault_cmode = arch_nvram_ops.read_byte(NV_CMODE);\n" " #endif\n" " \tif (default_cmode < CMODE_8 || default_cmode > CMODE_32)\n" " \t\tdefault_cmode = CMODE_8;\n" "Index: linux/drivers/video/fbdev/valkyriefb.c\n" - "=================================--- linux.orig/drivers/video/fbdev/valkyriefb.c\t2015-06-28 11:41:27.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/video/fbdev/valkyriefb.c\t2015-06-28 11:41:27.000000000 +1000\n" "+++ linux/drivers/video/fbdev/valkyriefb.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -287,7 +287,7 @@ static void __init valkyrie_choose_mode(\n" " \t/* Try to pick a video mode out of NVRAM if we have one. */\n" " #if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM)\n" - " \tif (default_vmode = VMODE_NVRAM) {\n" + " \tif (default_vmode == VMODE_NVRAM) {\n" "-\t\tdefault_vmode = nvram_read_byte(NV_VMODE);\n" "+\t\tdefault_vmode = arch_nvram_ops.read_byte(NV_VMODE);\n" " \t\tif (default_vmode <= 0\n" @@ -160,14 +167,15 @@ "@@ -300,7 +300,7 @@ static void __init valkyrie_choose_mode(\n" " \t\tdefault_vmode = VMODE_640_480_67;\n" " #if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM)\n" - " \tif (default_cmode = CMODE_NVRAM)\n" + " \tif (default_cmode == CMODE_NVRAM)\n" "-\t\tdefault_cmode = nvram_read_byte(NV_CMODE);\n" "+\t\tdefault_cmode = arch_nvram_ops.read_byte(NV_CMODE);\n" " #endif\n" " \n" " \t/*\n" "Index: linux/drivers/video/fbdev/imsttfb.c\n" - "=================================--- linux.orig/drivers/video/fbdev/imsttfb.c\t2015-06-28 11:41:27.000000000 +1000\n" + "===================================================================\n" + "--- linux.orig/drivers/video/fbdev/imsttfb.c\t2015-06-28 11:41:27.000000000 +1000\n" "+++ linux/drivers/video/fbdev/imsttfb.c\t2015-06-28 11:41:46.000000000 +1000\n" "@@ -328,7 +328,6 @@ enum {\n" " \tTVP = 1\n" @@ -186,17 +194,17 @@ " \t{\n" " \t\tint vmode = init_vmode, cmode = init_cmode;\n" " \n" - " \t\tif (vmode = -1) {\n" + " \t\tif (vmode == -1) {\n" "-\t\t\tvmode = nvram_read_byte(NV_VMODE);\n" "+\t\t\tvmode = arch_nvram_ops.read_byte(NV_VMODE);\n" " \t\t\tif (vmode <= 0 || vmode > VMODE_MAX)\n" " \t\t\t\tvmode = VMODE_640_480_67;\n" " \t\t}\n" - " \t\tif (cmode = -1) {\n" + " \t\tif (cmode == -1) {\n" "-\t\t\tcmode = nvram_read_byte(NV_CMODE);\n" "+\t\t\tcmode = arch_nvram_ops.read_byte(NV_CMODE);\n" " \t\t\tif (cmode < CMODE_8 || cmode > CMODE_32)\n" " \t\t\t\tcmode = CMODE_8;\n" " \t\t}" -ff61bbe5e418b5a6cecd4a97e3e31891d2237318b9fb409b00c3549183253a11 +b86b81345975b270d97666c2bf0165dc90349b094349e7328a4c97682d6e0d1d
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.