diff for duplicates of <201001181934.49519.PeterHuewe@gmx.de> diff --git a/a/1.txt b/N1/1.txt index 2b97df6..3790592 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -107,8 +107,8 @@ index 78414ba..790ca47 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 */ - } + @@ -246,7 +246,7 @@ index 78414ba..790ca47 100644 { @@ -356,31 +363,29 @@ static int matroxfb_dh_set_par(struct fb_info* info) { 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) @@ -268,14 +268,14 @@ index 78414ba..790ca47 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); @@ -392,7 +392,7 @@ index 78414ba..790ca47 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) + if (crt != 0) + return -ENODEV; + return matroxfb_wait_for_sync(minfo, 1); @@ -431,7 +431,7 @@ index 78414ba..790ca47 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; } @@ -447,12 +447,12 @@ index 78414ba..790ca47 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; @@ -462,7 +462,7 @@ index 78414ba..790ca47 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; } @@ -480,7 +480,7 @@ index 78414ba..790ca47 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; } - case MATROXFB_GET_AVAILABLE_OUTPUTS: @@ -500,7 +500,7 @@ index 78414ba..790ca47 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(conn, (u_int32_t __user *)arg)) + return -EFAULT; @@ -526,7 +526,7 @@ index 78414ba..790ca47 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 4f95256..3b465a7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Peter H\303\274we <PeterHuewe@gmx.de>\0" "Subject\0[PATCH] video/matrox: Checkpatch cleanups for matroxfb_crtc2.c\0" - "Date\0Mon, 18 Jan 2010 18:34:49 +0000\0" + "Date\0Mon, 18 Jan 2010 19:34:49 +0100\0" "To\0Petr Vandrovec <vandrove@vc.cvut.cz>\0" "Cc\0Andrew Morton <akpm@linux-foundation.org>" Jean Delvare <khali@linux-fr.org> @@ -119,8 +119,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" @@ -258,7 +258,7 @@ " \t{\n" "@@ -356,31 +363,29 @@ static int matroxfb_dh_set_par(struct fb_info* info) {\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" @@ -280,14 +280,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" @@ -404,7 +404,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\tif (crt != 0)\n" "+\t\t\t\treturn -ENODEV;\n" "+\t\t\treturn matroxfb_wait_for_sync(minfo, 1);\n" @@ -443,7 +443,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" @@ -459,12 +459,12 @@ "-\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\tif (minfo->devflags.panellink) {\n" "+\t\t\t\tif (tmp & MATROXFB_OUTPUT_CONN_DFP)\n" "+\t\t\t\t\treturn -EINVAL;\n" - "+\t\t\t\tif ((minfo->outputs[2].src = MATROXFB_SRC_CRTC1) && tmp)\n" + "+\t\t\t\tif ((minfo->outputs[2].src == MATROXFB_SRC_CRTC1) && tmp)\n" "+\t\t\t\t\treturn -EBUSY;\n" "+\t\t\t}\n" "+\t\t\tchanges = 0;\n" @@ -474,7 +474,7 @@ "+\t\t\t\t\t\tchanges = 1;\n" "+\t\t\t\t\t\tminfo->outputs[out].src = MATROXFB_SRC_CRTC2;\n" " \t\t\t\t\t}\n" - "+\t\t\t\t} else if (minfo->outputs[out].src = MATROXFB_SRC_CRTC2) {\n" + "+\t\t\t\t} else if (minfo->outputs[out].src == MATROXFB_SRC_CRTC2) {\n" "+\t\t\t\t\tchanges = 1;\n" "+\t\t\t\t\tminfo->outputs[out].src = MATROXFB_SRC_NONE;\n" " \t\t\t\t}\n" @@ -492,7 +492,7 @@ "+\t\t\tint out;\n" "+\n" "+\t\t\tfor (out = 0; out < MATROXFB_MAX_OUTPUTS; out++) {\n" - "+\t\t\t\tif (minfo->outputs[out].src = MATROXFB_SRC_CRTC2)\n" + "+\t\t\t\tif (minfo->outputs[out].src == MATROXFB_SRC_CRTC2)\n" "+\t\t\t\t\tconn |= 1 << out;\n" " \t\t\t}\n" "-\t\tcase MATROXFB_GET_AVAILABLE_OUTPUTS:\n" @@ -512,7 +512,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\tif (put_user(conn, (u_int32_t __user *)arg))\n" "+\t\t\t\treturn -EFAULT;\n" @@ -538,7 +538,7 @@ " \t\t\t}\n" "+\t\t\tif (minfo->devflags.panellink) {\n" "+\t\t\t\ttmp &= ~MATROXFB_OUTPUT_CONN_DFP;\n" - "+\t\t\t\tif (minfo->outputs[2].src = MATROXFB_SRC_CRTC1)\n" + "+\t\t\t\tif (minfo->outputs[2].src == MATROXFB_SRC_CRTC1)\n" "+\t\t\t\t\ttmp = 0;\n" "+\t\t\t}\n" "+\t\t\tif (put_user(tmp, (u_int32_t __user *)arg))\n" @@ -708,4 +708,4 @@ "-- \n" 1.6.4.4 -f7fbc5ddf8bb6aa8a4cd4174e18d7691b7fca37e06e97bdd362e69b3c63f4eb5 +b96e598d727de672f537e641bbea9028d18d0fb3160ecd944042f49427032efb
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.