diff for duplicates of <1808894.OunndLaMUR@avalon> diff --git a/a/1.txt b/N1/1.txt index 7f42517..026dba4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -200,7 +200,7 @@ That's what I do in my non-kernel code, but the kernel coding style uses (). It took me a bit of time to get used to it :-) > > + 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__); @@ -213,7 +213,7 @@ It took me a bit of time to get used to 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; @@ -259,7 +259,7 @@ boot due to missing core clocks anyway ? > > + 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: diff --git a/a/content_digest b/N1/content_digest index dba1d47..6dfe05a 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\020131106071809.GC17384@verge.net.au\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH 3/3] clk: shmobile: Add R8A7790 clocks support\0" - "Date\0Wed, 06 Nov 2013 12:56:18 +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 13:56:18 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -209,7 +209,7 @@ "It took me a bit of time to get used to it :-)\n" "\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" @@ -222,7 +222,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" @@ -268,7 +268,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" @@ -376,4 +376,4 @@ "\n" Laurent Pinchart -e8ef0ecf3a8f913a7a2e2285920b9ffc4d9f38ca45db7fdef83adbb31e4024bb +c7de419cc684ff2975abbd81aa34eecc5794a88d9cfa782f217fbf8f5905c2aa
diff --git a/a/1.txt b/N2/1.txt index 7f42517..026dba4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -200,7 +200,7 @@ That's what I do in my non-kernel code, but the kernel coding style uses (). It took me a bit of time to get used to it :-) > > + 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__); @@ -213,7 +213,7 @@ It took me a bit of time to get used to 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; @@ -259,7 +259,7 @@ boot due to missing core clocks anyway ? > > + 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: diff --git a/a/content_digest b/N2/content_digest index dba1d47..36f5200 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,8 +3,13 @@ "ref\020131106071809.GC17384@verge.net.au\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH 3/3] clk: shmobile: Add R8A7790 clocks support\0" - "Date\0Wed, 06 Nov 2013 12:56:18 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 06 Nov 2013 13:56:18 +0100\0" + "To\0Simon Horman <horms@verge.net.au>\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 Simon,\n" @@ -209,7 +214,7 @@ "It took me a bit of time to get used to it :-)\n" "\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" @@ -222,7 +227,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" @@ -268,7 +273,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" @@ -376,4 +381,4 @@ "\n" Laurent Pinchart -e8ef0ecf3a8f913a7a2e2285920b9ffc4d9f38ca45db7fdef83adbb31e4024bb +b8f7176adffe297b4ea9a5aaccc0bc364414a875f0d0bdfc0eaf5bb43247b508
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.