diff for duplicates of <20151130070044.GA23071@jci-VirtualBox> diff --git a/a/1.txt b/N1/1.txt index 216fdb7..6b3e1f2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,24 +7,23 @@ Signed-off-by: Prasanna Karthik <mkarthi3@visteon.com> drivers/clk/samsung/clk-s3c2410-dclk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -diff --git a/drivers/clk/samsung/clk-s3c2410-dclk.c b/drivers/clk/samsung/c= -lk-s3c2410-dclk.c +diff --git a/drivers/clk/samsung/clk-s3c2410-dclk.c b/drivers/clk/samsung/clk-s3c2410-dclk.c index e9eb935..ec6fb14 100644 --- a/drivers/clk/samsung/clk-s3c2410-dclk.c +++ b/drivers/clk/samsung/clk-s3c2410-dclk.c @@ -77,12 +77,11 @@ static u8 s3c24xx_clkout_get_parent(struct clk_hw *hw) static int s3c24xx_clkout_set_parent(struct clk_hw *hw, u8 index) { - struct s3c24xx_clkout *clkout =3D to_s3c24xx_clkout(hw); -- int ret =3D 0; -=20 + struct s3c24xx_clkout *clkout = to_s3c24xx_clkout(hw); +- int ret = 0; + s3c2410_modify_misccr((clkout->mask << clkout->shift), (index << clkout->shift)); -=20 + - return ret; + return 0; } -=20 - static const struct clk_ops s3c24xx_clkout_ops =3D { ---=20 + + static const struct clk_ops s3c24xx_clkout_ops = { +-- 1.9.1 diff --git a/a/content_digest b/N1/content_digest index 7ea7f85..4f107f3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -7,9 +7,9 @@ Tomasz Figa <tomasz.figa@gmail.com> Michael Turquette <mturquette@baylibre.com> " Stephen Boyd <sboyd@codeaurora.org>\0" - "Cc\0linux-clk@vger.kernel.org <linux-clk@vger.kernel.org>" - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - " linux-samsung-soc@vger.kernel.org <linux-samsung-soc@vger.kernel.org>\0" + "Cc\0linux-samsung-soc@vger.kernel.org <linux-samsung-soc@vger.kernel.org>" + linux-clk@vger.kernel.org <linux-clk@vger.kernel.org> + " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" "From: Prasanna Karthik <mkarthi3@visteon.com>\n" @@ -21,26 +21,25 @@ " drivers/clk/samsung/clk-s3c2410-dclk.c | 3 +--\n" " 1 file changed, 1 insertion(+), 2 deletions(-)\n" "\n" - "diff --git a/drivers/clk/samsung/clk-s3c2410-dclk.c b/drivers/clk/samsung/c=\n" - "lk-s3c2410-dclk.c\n" + "diff --git a/drivers/clk/samsung/clk-s3c2410-dclk.c b/drivers/clk/samsung/clk-s3c2410-dclk.c\n" "index e9eb935..ec6fb14 100644\n" "--- a/drivers/clk/samsung/clk-s3c2410-dclk.c\n" "+++ b/drivers/clk/samsung/clk-s3c2410-dclk.c\n" "@@ -77,12 +77,11 @@ static u8 s3c24xx_clkout_get_parent(struct clk_hw *hw)\n" " static int s3c24xx_clkout_set_parent(struct clk_hw *hw, u8 index)\n" " {\n" - " \tstruct s3c24xx_clkout *clkout =3D to_s3c24xx_clkout(hw);\n" - "-\tint ret =3D 0;\n" - "=20\n" + " \tstruct s3c24xx_clkout *clkout = to_s3c24xx_clkout(hw);\n" + "-\tint ret = 0;\n" + " \n" " \ts3c2410_modify_misccr((clkout->mask << clkout->shift),\n" " \t\t\t (index << clkout->shift));\n" - "=20\n" + " \n" "-\treturn ret;\n" "+\treturn 0;\n" " }\n" - "=20\n" - " static const struct clk_ops s3c24xx_clkout_ops =3D {\n" - "--=20\n" + " \n" + " static const struct clk_ops s3c24xx_clkout_ops = {\n" + "-- \n" 1.9.1 -26b54d3c22abbb6966aca758107a155da5a149679ed73014b744035d17b71bed +497049b2705825b5c16e0b02e214e799594ae1139140f737fbb2c9066b82d9ea
diff --git a/a/1.txt b/N2/1.txt index 216fdb7..6b3e1f2 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -7,24 +7,23 @@ Signed-off-by: Prasanna Karthik <mkarthi3@visteon.com> drivers/clk/samsung/clk-s3c2410-dclk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -diff --git a/drivers/clk/samsung/clk-s3c2410-dclk.c b/drivers/clk/samsung/c= -lk-s3c2410-dclk.c +diff --git a/drivers/clk/samsung/clk-s3c2410-dclk.c b/drivers/clk/samsung/clk-s3c2410-dclk.c index e9eb935..ec6fb14 100644 --- a/drivers/clk/samsung/clk-s3c2410-dclk.c +++ b/drivers/clk/samsung/clk-s3c2410-dclk.c @@ -77,12 +77,11 @@ static u8 s3c24xx_clkout_get_parent(struct clk_hw *hw) static int s3c24xx_clkout_set_parent(struct clk_hw *hw, u8 index) { - struct s3c24xx_clkout *clkout =3D to_s3c24xx_clkout(hw); -- int ret =3D 0; -=20 + struct s3c24xx_clkout *clkout = to_s3c24xx_clkout(hw); +- int ret = 0; + s3c2410_modify_misccr((clkout->mask << clkout->shift), (index << clkout->shift)); -=20 + - return ret; + return 0; } -=20 - static const struct clk_ops s3c24xx_clkout_ops =3D { ---=20 + + static const struct clk_ops s3c24xx_clkout_ops = { +-- 1.9.1 diff --git a/a/content_digest b/N2/content_digest index 7ea7f85..c24a9ea 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,15 +1,7 @@ - "From\0Mutharaju, Prasanna (P.) <mkarthi3@visteon.com>\0" + "From\0mkarthi3@visteon.com (Mutharaju, Prasanna (P.))\0" "Subject\0[PATCH] CLK: s3c2410: removed unneeded code in s3c24xx_clkout_set_parent\0" "Date\0Mon, 30 Nov 2015 07:01:08 +0000\0" - "To\0Kukjin Kim <kgene@kernel.org>" - Krzysztof Kozlowski <k.kozlowski@samsung.com> - Sylwester Nawrocki <s.nawrocki@samsung.com> - Tomasz Figa <tomasz.figa@gmail.com> - Michael Turquette <mturquette@baylibre.com> - " Stephen Boyd <sboyd@codeaurora.org>\0" - "Cc\0linux-clk@vger.kernel.org <linux-clk@vger.kernel.org>" - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - " linux-samsung-soc@vger.kernel.org <linux-samsung-soc@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "From: Prasanna Karthik <mkarthi3@visteon.com>\n" @@ -21,26 +13,25 @@ " drivers/clk/samsung/clk-s3c2410-dclk.c | 3 +--\n" " 1 file changed, 1 insertion(+), 2 deletions(-)\n" "\n" - "diff --git a/drivers/clk/samsung/clk-s3c2410-dclk.c b/drivers/clk/samsung/c=\n" - "lk-s3c2410-dclk.c\n" + "diff --git a/drivers/clk/samsung/clk-s3c2410-dclk.c b/drivers/clk/samsung/clk-s3c2410-dclk.c\n" "index e9eb935..ec6fb14 100644\n" "--- a/drivers/clk/samsung/clk-s3c2410-dclk.c\n" "+++ b/drivers/clk/samsung/clk-s3c2410-dclk.c\n" "@@ -77,12 +77,11 @@ static u8 s3c24xx_clkout_get_parent(struct clk_hw *hw)\n" " static int s3c24xx_clkout_set_parent(struct clk_hw *hw, u8 index)\n" " {\n" - " \tstruct s3c24xx_clkout *clkout =3D to_s3c24xx_clkout(hw);\n" - "-\tint ret =3D 0;\n" - "=20\n" + " \tstruct s3c24xx_clkout *clkout = to_s3c24xx_clkout(hw);\n" + "-\tint ret = 0;\n" + " \n" " \ts3c2410_modify_misccr((clkout->mask << clkout->shift),\n" " \t\t\t (index << clkout->shift));\n" - "=20\n" + " \n" "-\treturn ret;\n" "+\treturn 0;\n" " }\n" - "=20\n" - " static const struct clk_ops s3c24xx_clkout_ops =3D {\n" - "--=20\n" + " \n" + " static const struct clk_ops s3c24xx_clkout_ops = {\n" + "-- \n" 1.9.1 -26b54d3c22abbb6966aca758107a155da5a149679ed73014b744035d17b71bed +ae6d405243bb2924bb2c49ed657b6f64dcfcdfbabffece9a31e139ad12141191
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.