diff for duplicates of <201001182242.28291.PeterHuewe@gmx.de> diff --git a/a/1.txt b/N1/1.txt index 54e695f..c6e84e8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -98,8 +98,8 @@ index 78414ba..946f5b7 100644 tmp |= 0x00000004; /* source from pixclock */ /* PIXPLL is our clock source */ } -- if (minfo->outputs[0].src = MATROXFB_SRC_CRTC2) { -+ if (minfo->outputs[0].src = MATROXFB_SRC_CRTC2) +- if (minfo->outputs[0].src == MATROXFB_SRC_CRTC2) { ++ if (minfo->outputs[0].src == MATROXFB_SRC_CRTC2) tmp |= 0x00100000; /* connect CRTC2 to DAC */ - } + @@ -266,7 +266,7 @@ index 78414ba..946f5b7 100644 cnt = 0; down_read(&minfo->altout.lock); for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) { - if (minfo->outputs[out].src = MATROXFB_SRC_CRTC2) { + if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2) { cnt++; - if (minfo->outputs[out].output->compute) { + if (minfo->outputs[out].output->compute) @@ -288,14 +288,14 @@ index 78414ba..946f5b7 100644 DAC1064_global_restore(minfo); down_read(&minfo->altout.lock); for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) { - if (minfo->outputs[out].src = MATROXFB_SRC_CRTC2 && + if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2 && - minfo->outputs[out].output->program) { + minfo->outputs[out].output->program) { minfo->outputs[out].output->program(minfo->outputs[out].data); } } for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) { - if (minfo->outputs[out].src = MATROXFB_SRC_CRTC2 && + if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2 && - minfo->outputs[out].output->start) { + minfo->outputs[out].output->start) { minfo->outputs[out].output->start(minfo->outputs[out].data); @@ -409,7 +409,7 @@ index 78414ba..946f5b7 100644 - if (minfo->devflags.panellink) { - if (tmp & MATROXFB_OUTPUT_CONN_DFP) - return -EINVAL; -- if ((minfo->outputs[2].src = MATROXFB_SRC_CRTC1) && tmp) +- if ((minfo->outputs[2].src == MATROXFB_SRC_CRTC1) && tmp) - return -EBUSY; - } - changes = 0; @@ -419,7 +419,7 @@ index 78414ba..946f5b7 100644 - changes = 1; - minfo->outputs[out].src = MATROXFB_SRC_CRTC2; - } -- } else if (minfo->outputs[out].src = MATROXFB_SRC_CRTC2) { +- } else if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2) { - changes = 1; - minfo->outputs[out].src = MATROXFB_SRC_NONE; - } @@ -465,14 +465,14 @@ index 78414ba..946f5b7 100644 - int out; - - for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) { -- if (minfo->outputs[out].src = MATROXFB_SRC_CRTC2) { +- if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2) { - conn |= 1 << out; - } + } + if (minfo->devflags.panellink) { + if (tmp & MATROXFB_OUTPUT_CONN_DFP) + return -EINVAL; -+ if ((minfo->outputs[2].src = MATROXFB_SRC_CRTC1) && tmp) ++ if ((minfo->outputs[2].src == MATROXFB_SRC_CRTC1) && tmp) + return -EBUSY; + } + changes = 0; @@ -485,7 +485,7 @@ index 78414ba..946f5b7 100644 - if (put_user(conn, (u_int32_t __user *)arg)) - return -EFAULT; - return 0; -+ } else if (minfo->outputs[out].src = MATROXFB_SRC_CRTC2) { ++ } else if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2) { + changes = 1; + minfo->outputs[out].src = MATROXFB_SRC_NONE; } @@ -506,7 +506,7 @@ index 78414ba..946f5b7 100644 - } - if (minfo->devflags.panellink) { - tmp &= ~MATROXFB_OUTPUT_CONN_DFP; -- if (minfo->outputs[2].src = MATROXFB_SRC_CRTC1) { +- if (minfo->outputs[2].src == MATROXFB_SRC_CRTC1) { - tmp = 0; - } + } @@ -520,7 +520,7 @@ index 78414ba..946f5b7 100644 + int out; + + for (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) { -+ if (minfo->outputs[out].src = MATROXFB_SRC_CRTC2) ++ if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2) + conn |= 1 << out; + } + if (put_user(conn, (u_int32_t __user *)arg)) @@ -546,7 +546,7 @@ index 78414ba..946f5b7 100644 + } + if (minfo->devflags.panellink) { + tmp &= ~MATROXFB_OUTPUT_CONN_DFP; -+ if (minfo->outputs[2].src = MATROXFB_SRC_CRTC1) ++ if (minfo->outputs[2].src == MATROXFB_SRC_CRTC1) + tmp = 0; + } + if (put_user(tmp, (u_int32_t __user *)arg)) diff --git a/a/content_digest b/N1/content_digest index f310a9b..5bbac12 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020100118221146.5d81fc0e@hyperion.delvare\0" "From\0Peter H\303\274we <PeterHuewe@gmx.de>\0" "Subject\0[PATCH v3] video/matrox: Checkpatch cleanups for matroxfb_crtc2.c\0" - "Date\0Mon, 18 Jan 2010 21:42:28 +0000\0" + "Date\0Mon, 18 Jan 2010 22:42:28 +0100\0" "To\0Jean Delvare <khali@linux-fr.org>\0" "Cc\0Joe Perches <joe@perches.com>" Petr Vandrovec <vandrove@vc.cvut.cz> @@ -114,8 +114,8 @@ " \t\ttmp |= 0x00000004; /* source from pixclock */\n" " \t\t/* PIXPLL is our clock source */\n" " \t}\n" - "-\tif (minfo->outputs[0].src = MATROXFB_SRC_CRTC2) {\n" - "+\tif (minfo->outputs[0].src = MATROXFB_SRC_CRTC2)\n" + "-\tif (minfo->outputs[0].src == MATROXFB_SRC_CRTC2) {\n" + "+\tif (minfo->outputs[0].src == MATROXFB_SRC_CRTC2)\n" " \t\ttmp |= 0x00100000;\t/* connect CRTC2 to DAC */\n" "-\t}\n" "+\n" @@ -282,7 +282,7 @@ " \t\tcnt = 0;\n" " \t\tdown_read(&minfo->altout.lock);\n" " \t\tfor (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {\n" - " \t\t\tif (minfo->outputs[out].src = MATROXFB_SRC_CRTC2) {\n" + " \t\t\tif (minfo->outputs[out].src == MATROXFB_SRC_CRTC2) {\n" " \t\t\t\tcnt++;\n" "-\t\t\t\tif (minfo->outputs[out].output->compute) {\n" "+\t\t\t\tif (minfo->outputs[out].output->compute)\n" @@ -304,14 +304,14 @@ " \t\tDAC1064_global_restore(minfo);\n" " \t\tdown_read(&minfo->altout.lock);\n" " \t\tfor (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {\n" - " \t\t\tif (minfo->outputs[out].src = MATROXFB_SRC_CRTC2 &&\n" + " \t\t\tif (minfo->outputs[out].src == MATROXFB_SRC_CRTC2 &&\n" "-\t\t\t minfo->outputs[out].output->program) {\n" "+\t\t\t\tminfo->outputs[out].output->program) {\n" " \t\t\t\tminfo->outputs[out].output->program(minfo->outputs[out].data);\n" " \t\t\t}\n" " \t\t}\n" " \t\tfor (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {\n" - " \t\t\tif (minfo->outputs[out].src = MATROXFB_SRC_CRTC2 &&\n" + " \t\t\tif (minfo->outputs[out].src == MATROXFB_SRC_CRTC2 &&\n" "-\t\t\t minfo->outputs[out].output->start) {\n" "+\t\t\t\tminfo->outputs[out].output->start) {\n" " \t\t\t\tminfo->outputs[out].output->start(minfo->outputs[out].data);\n" @@ -425,7 +425,7 @@ "-\t\t\t\tif (minfo->devflags.panellink) {\n" "-\t\t\t\t\tif (tmp & MATROXFB_OUTPUT_CONN_DFP)\n" "-\t\t\t\t\t\treturn -EINVAL;\n" - "-\t\t\t\t\tif ((minfo->outputs[2].src = MATROXFB_SRC_CRTC1) && tmp)\n" + "-\t\t\t\t\tif ((minfo->outputs[2].src == MATROXFB_SRC_CRTC1) && tmp)\n" "-\t\t\t\t\t\treturn -EBUSY;\n" "-\t\t\t\t}\n" "-\t\t\t\tchanges = 0;\n" @@ -435,7 +435,7 @@ "-\t\t\t\t\t\t\tchanges = 1;\n" "-\t\t\t\t\t\t\tminfo->outputs[out].src = MATROXFB_SRC_CRTC2;\n" "-\t\t\t\t\t\t}\n" - "-\t\t\t\t\t} else if (minfo->outputs[out].src = MATROXFB_SRC_CRTC2) {\n" + "-\t\t\t\t\t} else if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2) {\n" "-\t\t\t\t\t\tchanges = 1;\n" "-\t\t\t\t\t\tminfo->outputs[out].src = MATROXFB_SRC_NONE;\n" "-\t\t\t\t\t}\n" @@ -481,14 +481,14 @@ "-\t\t\t\tint out;\n" "-\n" "-\t\t\t\tfor (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {\n" - "-\t\t\t\t\tif (minfo->outputs[out].src = MATROXFB_SRC_CRTC2) {\n" + "-\t\t\t\t\tif (minfo->outputs[out].src == MATROXFB_SRC_CRTC2) {\n" "-\t\t\t\t\t\tconn |= 1 << out;\n" "-\t\t\t\t\t}\n" "+\t\t}\n" "+\t\tif (minfo->devflags.panellink) {\n" "+\t\t\tif (tmp & MATROXFB_OUTPUT_CONN_DFP)\n" "+\t\t\t\treturn -EINVAL;\n" - "+\t\t\tif ((minfo->outputs[2].src = MATROXFB_SRC_CRTC1) && tmp)\n" + "+\t\t\tif ((minfo->outputs[2].src == MATROXFB_SRC_CRTC1) && tmp)\n" "+\t\t\t\treturn -EBUSY;\n" "+\t\t}\n" "+\t\tchanges = 0;\n" @@ -501,7 +501,7 @@ "-\t\t\t\tif (put_user(conn, (u_int32_t __user *)arg))\n" "-\t\t\t\t\treturn -EFAULT;\n" "-\t\t\t\treturn 0;\n" - "+\t\t\t} else if (minfo->outputs[out].src = MATROXFB_SRC_CRTC2) {\n" + "+\t\t\t} else if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2) {\n" "+\t\t\t\tchanges = 1;\n" "+\t\t\t\tminfo->outputs[out].src = MATROXFB_SRC_NONE;\n" " \t\t\t}\n" @@ -522,7 +522,7 @@ "-\t\t\t\t}\n" "-\t\t\t\tif (minfo->devflags.panellink) {\n" "-\t\t\t\t\ttmp &= ~MATROXFB_OUTPUT_CONN_DFP;\n" - "-\t\t\t\t\tif (minfo->outputs[2].src = MATROXFB_SRC_CRTC1) {\n" + "-\t\t\t\t\tif (minfo->outputs[2].src == MATROXFB_SRC_CRTC1) {\n" "-\t\t\t\t\t\ttmp = 0;\n" "-\t\t\t\t\t}\n" "+\t\t}\n" @@ -536,7 +536,7 @@ "+\t\tint out;\n" "+\n" "+\t\tfor (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {\n" - "+\t\t\tif (minfo->outputs[out].src = MATROXFB_SRC_CRTC2)\n" + "+\t\t\tif (minfo->outputs[out].src == MATROXFB_SRC_CRTC2)\n" "+\t\t\t\tconn |= 1 << out;\n" "+\t\t}\n" "+\t\tif (put_user(conn, (u_int32_t __user *)arg))\n" @@ -562,7 +562,7 @@ "+\t\t}\n" "+\t\tif (minfo->devflags.panellink) {\n" "+\t\t\ttmp &= ~MATROXFB_OUTPUT_CONN_DFP;\n" - "+\t\t\tif (minfo->outputs[2].src = MATROXFB_SRC_CRTC1)\n" + "+\t\t\tif (minfo->outputs[2].src == MATROXFB_SRC_CRTC1)\n" "+\t\t\t\ttmp = 0;\n" "+\t\t}\n" "+\t\tif (put_user(tmp, (u_int32_t __user *)arg))\n" @@ -743,4 +743,4 @@ "-- \n" 1.6.4.4 -4a82fbe6ed24b294dfcd1d17209c4609cb4d9e7984e852b98ea65157e5caa4c1 +721e9394b13d5eadf735b483799d09e5f39558a2bcbd88b16bccb5d74849b580
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.