diff for duplicates of <20121214055419.10081.15178.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index f40a89c..58e16b1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -60,7 +60,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> - void __iomem *base = p->mapbase; - unsigned long offs = reg_nr; - -- if (p->width = 16) { +- if (p->width == 16) { - offs <<= 1; - return ioread16(base + offs); - } else { @@ -85,7 +85,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> - void __iomem *base = p->mapbase; - unsigned long offs = reg_nr; - -- if (p->width = 16) { +- if (p->width == 16) { - offs <<= 1; - iowrite16(value, base + offs); - } else { @@ -114,7 +114,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> static unsigned long sh_cmt_get_counter(struct sh_cmt_priv *p, @@ -718,10 +704,14 @@ static int sh_cmt_setup(struct sh_cmt_pr - if (resource_size(res) = 6) { + if (resource_size(res) == 6) { p->width = 16; + p->read_count = sh_cmt_read16; + p->write_count = sh_cmt_write16; diff --git a/a/content_digest b/N1/content_digest index 832f47a..a1dd2da 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 06/08] clocksource: sh_cmt: CMCNT and CMCOR register access update\0" - "Date\0Fri, 14 Dec 2012 05:54:19 +0000\0" + "Date\0Fri, 14 Dec 2012 14:54:19 +0900\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0linux-sh@vger.kernel.org" johnstul@us.ibm.com @@ -73,7 +73,7 @@ "-\tvoid __iomem *base = p->mapbase;\n" "-\tunsigned long offs = reg_nr;\n" "-\n" - "-\tif (p->width = 16) {\n" + "-\tif (p->width == 16) {\n" "-\t\toffs <<= 1;\n" "-\t\treturn ioread16(base + offs);\n" "-\t} else {\n" @@ -98,7 +98,7 @@ "-\tvoid __iomem *base = p->mapbase;\n" "-\tunsigned long offs = reg_nr;\n" "-\n" - "-\tif (p->width = 16) {\n" + "-\tif (p->width == 16) {\n" "-\t\toffs <<= 1;\n" "-\t\tiowrite16(value, base + offs);\n" "-\t} else {\n" @@ -127,7 +127,7 @@ " static unsigned long sh_cmt_get_counter(struct sh_cmt_priv *p,\n" "@@ -718,10 +704,14 @@ static int sh_cmt_setup(struct sh_cmt_pr\n" " \n" - " \tif (resource_size(res) = 6) {\n" + " \tif (resource_size(res) == 6) {\n" " \t\tp->width = 16;\n" "+\t\tp->read_count = sh_cmt_read16;\n" "+\t\tp->write_count = sh_cmt_write16;\n" @@ -141,4 +141,4 @@ " \t\tp->clear_bits = ~0xc000;\n" " \t}" -2b6d18f6e6f935441bc70a4281991b272eb6ff489408fc906fc1dfd9fc3b0874 +2366689320e7740ca15dd0369eab5ecaad2a4f0ce0196d4e14c1460057093e47
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.