diff for duplicates of <1436874720.3948.252.camel@kernel.crashing.org> diff --git a/a/1.txt b/N1/1.txt index 2801245..1993fc3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,7 +33,8 @@ rather than using ifdef's ? > 7 files changed, 17 insertions(+), 18 deletions(-) > > Index: linux/arch/powerpc/kernel/setup_32.c -> =================================> --- linux.orig/arch/powerpc/kernel/setup_32.c 2015-07-13 21:33:01.000000000 +1000 +> =================================================================== +> --- linux.orig/arch/powerpc/kernel/setup_32.c 2015-07-13 21:33:01.000000000 +1000 > +++ linux/arch/powerpc/kernel/setup_32.c 2015-07-13 21:33:02.000000000 +1000 > @@ -170,20 +170,18 @@ __setup("l3cr=", ppc_setup_l3cr); > @@ -68,7 +69,8 @@ rather than using ifdef's ? > .sync = ppc_nvram_sync, > }; > Index: linux/drivers/char/generic_nvram.c -> =================================> --- linux.orig/drivers/char/generic_nvram.c 2015-07-13 21:33:01.000000000 +1000 +> =================================================================== +> --- linux.orig/drivers/char/generic_nvram.c 2015-07-13 21:33:01.000000000 +1000 > +++ linux/drivers/char/generic_nvram.c 2015-07-13 21:33:02.000000000 +1000 > @@ -64,7 +64,7 @@ static ssize_t read_nvram(struct file *f > if (*ppos >= nvram_len) @@ -89,28 +91,30 @@ rather than using ifdef's ? > *ppos = i; > return p - buf; > Index: linux/drivers/video/fbdev/controlfb.c -> =================================> --- linux.orig/drivers/video/fbdev/controlfb.c 2015-07-13 21:32:43.000000000 +1000 +> =================================================================== +> --- linux.orig/drivers/video/fbdev/controlfb.c 2015-07-13 21:32:43.000000000 +1000 > +++ linux/drivers/video/fbdev/controlfb.c 2015-07-13 21:33:02.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-07-13 21:32:57.000000000 +1000 +> =================================================================== +> --- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c 2015-07-13 21:32:57.000000000 +1000 > +++ linux/drivers/video/fbdev/matrox/matroxfb_base.c 2015-07-13 21:33:02.000000000 +1000 > @@ -1886,9 +1886,9 @@ static int initMatrox2(struct matrox_fb_ > struct fb_var_screeninfo var; @@ -118,18 +122,19 @@ rather than using ifdef's ? > default_vmode = VMODE_640_480_60; > -#ifdef CONFIG_NVRAM > +#if defined(CONFIG_NVRAM) && defined(CONFIG_PPC32) -> 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-07-13 21:32:43.000000000 +1000 +> =================================================================== +> --- linux.orig/drivers/video/fbdev/platinumfb.c 2015-07-13 21:32:43.000000000 +1000 > +++ linux/drivers/video/fbdev/platinumfb.c 2015-07-13 21:33:02.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); @@ -139,19 +144,20 @@ rather than using ifdef's ? > @@ -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-07-13 21:32:43.000000000 +1000 +> =================================================================== +> --- linux.orig/drivers/video/fbdev/valkyriefb.c 2015-07-13 21:32:43.000000000 +1000 > +++ linux/drivers/video/fbdev/valkyriefb.c 2015-07-13 21:33:02.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 @@ -160,14 +166,15 @@ rather than using ifdef's ? > @@ -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-07-13 21:32:43.000000000 +1000 +> =================================================================== +> --- linux.orig/drivers/video/fbdev/imsttfb.c 2015-07-13 21:32:43.000000000 +1000 > +++ linux/drivers/video/fbdev/imsttfb.c 2015-07-13 21:33:02.000000000 +1000 > @@ -328,7 +328,6 @@ enum { > TVP = 1 @@ -186,13 +193,13 @@ rather than using ifdef's ? > { > 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 be2ac7e..f02b191 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,8 +2,8 @@ "ref\020150712102531.505897278@telegraphics.com.au\0" "ref\0alpine.LNX.2.00.1507141725480.851@nippy.intranet\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" - "Subject\0Re: [RFC v4 17/25] powerpc, fbdev: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram\0" - "Date\0Tue, 14 Jul 2015 11:52:00 +0000\0" + "Subject\0Re: [RFC v4 17/25] powerpc, fbdev: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram_write_byte()\0" + "Date\0Tue, 14 Jul 2015 21:52:00 +1000\0" "To\0Finn Thain <fthain@telegraphics.com.au>\0" "Cc\0linux-kernel@vger.kernel.org" linux-m68k@vger.kernel.org @@ -52,7 +52,8 @@ "> 7 files changed, 17 insertions(+), 18 deletions(-)\n" "> \n" "> Index: linux/arch/powerpc/kernel/setup_32.c\n" - "> =================================> --- linux.orig/arch/powerpc/kernel/setup_32.c\t2015-07-13 21:33:01.000000000 +1000\n" + "> ===================================================================\n" + "> --- linux.orig/arch/powerpc/kernel/setup_32.c\t2015-07-13 21:33:01.000000000 +1000\n" "> +++ linux/arch/powerpc/kernel/setup_32.c\t2015-07-13 21:33:02.000000000 +1000\n" "> @@ -170,20 +170,18 @@ __setup(\"l3cr=\", ppc_setup_l3cr);\n" "> \n" @@ -87,7 +88,8 @@ "> \t.sync = ppc_nvram_sync,\n" "> };\n" "> Index: linux/drivers/char/generic_nvram.c\n" - "> =================================> --- linux.orig/drivers/char/generic_nvram.c\t2015-07-13 21:33:01.000000000 +1000\n" + "> ===================================================================\n" + "> --- linux.orig/drivers/char/generic_nvram.c\t2015-07-13 21:33:01.000000000 +1000\n" "> +++ linux/drivers/char/generic_nvram.c\t2015-07-13 21:33:02.000000000 +1000\n" "> @@ -64,7 +64,7 @@ static ssize_t read_nvram(struct file *f\n" "> \tif (*ppos >= nvram_len)\n" @@ -108,28 +110,30 @@ "> \t*ppos = i;\n" "> \treturn p - buf;\n" "> Index: linux/drivers/video/fbdev/controlfb.c\n" - "> =================================> --- linux.orig/drivers/video/fbdev/controlfb.c\t2015-07-13 21:32:43.000000000 +1000\n" + "> ===================================================================\n" + "> --- linux.orig/drivers/video/fbdev/controlfb.c\t2015-07-13 21:32:43.000000000 +1000\n" "> +++ linux/drivers/video/fbdev/controlfb.c\t2015-07-13 21:33:02.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-07-13 21:32:57.000000000 +1000\n" + "> ===================================================================\n" + "> --- linux.orig/drivers/video/fbdev/matrox/matroxfb_base.c\t2015-07-13 21:32:57.000000000 +1000\n" "> +++ linux/drivers/video/fbdev/matrox/matroxfb_base.c\t2015-07-13 21:33:02.000000000 +1000\n" "> @@ -1886,9 +1886,9 @@ static int initMatrox2(struct matrox_fb_\n" "> \t\tstruct fb_var_screeninfo var;\n" @@ -137,18 +141,19 @@ "> \t\t\tdefault_vmode = VMODE_640_480_60;\n" "> -#ifdef CONFIG_NVRAM\n" "> +#if defined(CONFIG_NVRAM) && defined(CONFIG_PPC32)\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-07-13 21:32:43.000000000 +1000\n" + "> ===================================================================\n" + "> --- linux.orig/drivers/video/fbdev/platinumfb.c\t2015-07-13 21:32:43.000000000 +1000\n" "> +++ linux/drivers/video/fbdev/platinumfb.c\t2015-07-13 21:33:02.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" @@ -158,19 +163,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-07-13 21:32:43.000000000 +1000\n" + "> ===================================================================\n" + "> --- linux.orig/drivers/video/fbdev/valkyriefb.c\t2015-07-13 21:32:43.000000000 +1000\n" "> +++ linux/drivers/video/fbdev/valkyriefb.c\t2015-07-13 21:33:02.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" @@ -179,14 +185,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-07-13 21:32:43.000000000 +1000\n" + "> ===================================================================\n" + "> --- linux.orig/drivers/video/fbdev/imsttfb.c\t2015-07-13 21:32:43.000000000 +1000\n" "> +++ linux/drivers/video/fbdev/imsttfb.c\t2015-07-13 21:33:02.000000000 +1000\n" "> @@ -328,7 +328,6 @@ enum {\n" "> \tTVP = 1\n" @@ -205,17 +212,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}" -7ca9ad91d0f6f2a17b02a49922098747cdf5a30bffccfaa897e2f7f481945cde +681b23908579661c86e8eb1b6b7d430d11036c2ed2e6c1bbe6fa1b9bbb82e8e4
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.