diff for duplicates of <20121214055410.10081.32594.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index 76d082d..aafd604 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -47,20 +47,20 @@ Signed-off-by: Magnus Damm <damm@opensource.se> - unsigned long offs; + unsigned long offs = reg_nr; -- if (reg_nr = CMSTR) { +- if (reg_nr == CMSTR) { - offs = 0; - base -= cfg->channel_offset; - } else - offs = reg_nr; - -- if (p->width = 16) -+ if (p->width = 16) { +- if (p->width == 16) ++ if (p->width == 16) { offs <<= 1; - else { + return ioread16(base + offs); + } else { offs <<= 2; -- if ((reg_nr = CMCNT) || (reg_nr = CMCOR)) +- if ((reg_nr == CMCNT) || (reg_nr == CMCOR)) - return ioread32(base + offs); + return ioread32(base + offs); } @@ -91,21 +91,21 @@ Signed-off-by: Magnus Damm <damm@opensource.se> void __iomem *base = p->mapbase; - unsigned long offs; - -- if (reg_nr = CMSTR) { +- if (reg_nr == CMSTR) { - offs = 0; - base -= cfg->channel_offset; - } else - offs = reg_nr; + unsigned long offs = reg_nr; -- if (p->width = 16) -+ if (p->width = 16) { +- if (p->width == 16) ++ if (p->width == 16) { offs <<= 1; - else { + iowrite16(value, base + offs); + } else { offs <<= 2; -- if ((reg_nr = CMCNT) || (reg_nr = CMCOR)) { +- if ((reg_nr == CMCNT) || (reg_nr == CMCOR)) { - iowrite32(value, base + offs); - return; - } diff --git a/a/content_digest b/N1/content_digest index 56cd405..3efb1d0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020121214055323.10081.12056.sendpatchset@w520\0" "From\0Magnus Damm <magnus.damm@gmail.com>\0" "Subject\0[PATCH 05/08] clocksource: sh_cmt: CMSTR and CMCSR register access update\0" - "Date\0Fri, 14 Dec 2012 05:54:10 +0000\0" + "Date\0Fri, 14 Dec 2012 14:54:10 +0900\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0linux-sh@vger.kernel.org" johnstul@us.ibm.com @@ -60,20 +60,20 @@ "-\tunsigned long offs;\n" "+\tunsigned long offs = reg_nr;\n" " \n" - "-\tif (reg_nr = CMSTR) {\n" + "-\tif (reg_nr == CMSTR) {\n" "-\t\toffs = 0;\n" "-\t\tbase -= cfg->channel_offset;\n" "-\t} else\n" "-\t\toffs = reg_nr;\n" "-\n" - "-\tif (p->width = 16)\n" - "+\tif (p->width = 16) {\n" + "-\tif (p->width == 16)\n" + "+\tif (p->width == 16) {\n" " \t\toffs <<= 1;\n" "-\telse {\n" "+\t\treturn ioread16(base + offs);\n" "+\t} else {\n" " \t\toffs <<= 2;\n" - "-\t\tif ((reg_nr = CMCNT) || (reg_nr = CMCOR))\n" + "-\t\tif ((reg_nr == CMCNT) || (reg_nr == CMCOR))\n" "-\t\t\treturn ioread32(base + offs);\n" "+\t\treturn ioread32(base + offs);\n" " \t}\n" @@ -104,21 +104,21 @@ " \tvoid __iomem *base = p->mapbase;\n" "-\tunsigned long offs;\n" "-\n" - "-\tif (reg_nr = CMSTR) {\n" + "-\tif (reg_nr == CMSTR) {\n" "-\t\toffs = 0;\n" "-\t\tbase -= cfg->channel_offset;\n" "-\t} else\n" "-\t\toffs = reg_nr;\n" "+\tunsigned long offs = reg_nr;\n" " \n" - "-\tif (p->width = 16)\n" - "+\tif (p->width = 16) {\n" + "-\tif (p->width == 16)\n" + "+\tif (p->width == 16) {\n" " \t\toffs <<= 1;\n" "-\telse {\n" "+\t\tiowrite16(value, base + offs);\n" "+\t} else {\n" " \t\toffs <<= 2;\n" - "-\t\tif ((reg_nr = CMCNT) || (reg_nr = CMCOR)) {\n" + "-\t\tif ((reg_nr == CMCNT) || (reg_nr == CMCOR)) {\n" "-\t\t\tiowrite32(value, base + offs);\n" "-\t\t\treturn;\n" "-\t\t}\n" @@ -154,4 +154,4 @@ " static void sh_cmt_start_stop_ch(struct sh_cmt_priv *p, int start)\n" { -8e4bd9036ced1ee30566c749563cce84d5d693ae1f99b0f847bd8aaa72041528 +f963671cca73aec921c453571c0f6965f96188e7d0882dafcef38b9542da0002
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.