diff for duplicates of <2199055.1gOuVSSAtq@avalon> diff --git a/a/1.txt b/N1/1.txt index e3384b9..4d0ac61 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -41,7 +41,7 @@ On Tuesday 05 November 2013 00:52:29 Kuninori Morimoto wrote: > > + div = cpg_mode & BIT(18) ? 36 : 24; > > + break; > > + case R8A7790_CLK_QSPI: -> > + div = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) = BIT(2) +> > + div = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) == BIT(2) > > + ? 16 : 20; > > + break; > > + case R8A7790_CLK_SDH: @@ -76,7 +76,7 @@ need it. > > + > > + cpg = kzalloc(sizeof(*cpg), GFP_KERNEL); > > + clks = kzalloc(CPG_NUM_CLOCKS * sizeof(*clks), GFP_KERNEL); -> > + if (cpg = NULL || clks = NULL) { +> > + if (cpg == NULL || clks == NULL) { > > + kfree(clks); > > + kfree(cpg); > > + pr_err("%s: failed to allocate cpg\n", __func__); @@ -89,7 +89,7 @@ need it. > > + cpg->data.clk_num = CPG_NUM_CLOCKS; > > + > > + cpg->reg = of_iomap(np, 0); -> > + if (WARN_ON(cpg->reg = NULL)) { +> > + if (WARN_ON(cpg->reg == NULL)) { > > + kfree(cpg->data.clks); > > + kfree(cpg); > > + return; diff --git a/a/content_digest b/N1/content_digest index 6053142..ccae91b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\01383058511-26046-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "ref\01383058511-26046-4-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "ref\087r4avnsc6.wl%kuninori.morimoto.gx@renesas.com\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH 3/3] clk: shmobile: Add R8A7790 clocks support\0" - "Date\0Tue, 05 Nov 2013 23:57:16 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH 3/3] clk: shmobile: Add R8A7790 clocks support\0" + "Date\0Wed, 06 Nov 2013 00:57:16 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -50,7 +50,7 @@ "> > +\t\t\tdiv = cpg_mode & BIT(18) ? 36 : 24;\n" "> > +\t\t\tbreak;\n" "> > +\t\tcase R8A7790_CLK_QSPI:\n" - "> > +\t\t\tdiv = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) = BIT(2)\n" + "> > +\t\t\tdiv = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) == BIT(2)\n" "> > +\t\t\t ? 16 : 20;\n" "> > +\t\t\tbreak;\n" "> > +\t\tcase R8A7790_CLK_SDH:\n" @@ -85,7 +85,7 @@ "> > +\n" "> > +\tcpg = kzalloc(sizeof(*cpg), GFP_KERNEL);\n" "> > +\tclks = kzalloc(CPG_NUM_CLOCKS * sizeof(*clks), GFP_KERNEL);\n" - "> > +\tif (cpg = NULL || clks = NULL) {\n" + "> > +\tif (cpg == NULL || clks == NULL) {\n" "> > +\t\tkfree(clks);\n" "> > +\t\tkfree(cpg);\n" "> > +\t\tpr_err(\"%s: failed to allocate cpg\\n\", __func__);\n" @@ -98,7 +98,7 @@ "> > +\tcpg->data.clk_num = CPG_NUM_CLOCKS;\n" "> > +\n" "> > +\tcpg->reg = of_iomap(np, 0);\n" - "> > +\tif (WARN_ON(cpg->reg = NULL)) {\n" + "> > +\tif (WARN_ON(cpg->reg == NULL)) {\n" "> > +\t\tkfree(cpg->data.clks);\n" "> > +\t\tkfree(cpg);\n" "> > +\t\treturn;\n" @@ -119,4 +119,4 @@ "\n" Laurent Pinchart -6ef6fe59d9f20814b2330683495114b9a57921884dd13100e3cc34d76b4c422d +99581afef3cb876e7c3382cee0e8c5dc4d344285b444169fd616813ca1ea3e10
diff --git a/a/1.txt b/N2/1.txt index e3384b9..4d0ac61 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -41,7 +41,7 @@ On Tuesday 05 November 2013 00:52:29 Kuninori Morimoto wrote: > > + div = cpg_mode & BIT(18) ? 36 : 24; > > + break; > > + case R8A7790_CLK_QSPI: -> > + div = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) = BIT(2) +> > + div = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) == BIT(2) > > + ? 16 : 20; > > + break; > > + case R8A7790_CLK_SDH: @@ -76,7 +76,7 @@ need it. > > + > > + cpg = kzalloc(sizeof(*cpg), GFP_KERNEL); > > + clks = kzalloc(CPG_NUM_CLOCKS * sizeof(*clks), GFP_KERNEL); -> > + if (cpg = NULL || clks = NULL) { +> > + if (cpg == NULL || clks == NULL) { > > + kfree(clks); > > + kfree(cpg); > > + pr_err("%s: failed to allocate cpg\n", __func__); @@ -89,7 +89,7 @@ need it. > > + cpg->data.clk_num = CPG_NUM_CLOCKS; > > + > > + cpg->reg = of_iomap(np, 0); -> > + if (WARN_ON(cpg->reg = NULL)) { +> > + if (WARN_ON(cpg->reg == NULL)) { > > + kfree(cpg->data.clks); > > + kfree(cpg); > > + return; diff --git a/a/content_digest b/N2/content_digest index 6053142..f1e97fe 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,8 +3,13 @@ "ref\087r4avnsc6.wl%kuninori.morimoto.gx@renesas.com\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH 3/3] clk: shmobile: Add R8A7790 clocks support\0" - "Date\0Tue, 05 Nov 2013 23:57:16 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 06 Nov 2013 00:57:16 +0100\0" + "To\0Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>\0" + "Cc\0Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>" + linux-sh@vger.kernel.org + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + " Mike Turquette <mturquette@linaro.org>\0" "\00:1\0" "b\0" "Hi Morimoto-san,\n" @@ -50,7 +55,7 @@ "> > +\t\t\tdiv = cpg_mode & BIT(18) ? 36 : 24;\n" "> > +\t\t\tbreak;\n" "> > +\t\tcase R8A7790_CLK_QSPI:\n" - "> > +\t\t\tdiv = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) = BIT(2)\n" + "> > +\t\t\tdiv = (cpg_mode & (BIT(3) | BIT(2) | BIT(1))) == BIT(2)\n" "> > +\t\t\t ? 16 : 20;\n" "> > +\t\t\tbreak;\n" "> > +\t\tcase R8A7790_CLK_SDH:\n" @@ -85,7 +90,7 @@ "> > +\n" "> > +\tcpg = kzalloc(sizeof(*cpg), GFP_KERNEL);\n" "> > +\tclks = kzalloc(CPG_NUM_CLOCKS * sizeof(*clks), GFP_KERNEL);\n" - "> > +\tif (cpg = NULL || clks = NULL) {\n" + "> > +\tif (cpg == NULL || clks == NULL) {\n" "> > +\t\tkfree(clks);\n" "> > +\t\tkfree(cpg);\n" "> > +\t\tpr_err(\"%s: failed to allocate cpg\\n\", __func__);\n" @@ -98,7 +103,7 @@ "> > +\tcpg->data.clk_num = CPG_NUM_CLOCKS;\n" "> > +\n" "> > +\tcpg->reg = of_iomap(np, 0);\n" - "> > +\tif (WARN_ON(cpg->reg = NULL)) {\n" + "> > +\tif (WARN_ON(cpg->reg == NULL)) {\n" "> > +\t\tkfree(cpg->data.clks);\n" "> > +\t\tkfree(cpg);\n" "> > +\t\treturn;\n" @@ -119,4 +124,4 @@ "\n" Laurent Pinchart -6ef6fe59d9f20814b2330683495114b9a57921884dd13100e3cc34d76b4c422d +6bfe2c8e055ecf0393d11d35c287b0d61dee1254d8c51b0d649100d500e97b89
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.