diff for duplicates of <20151130100720.GA29096@jci-VirtualBox> diff --git a/a/1.txt b/N1/1.txt index 36864d8..4eb18d0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,24 +11,23 @@ v3: Modified subject and changelog comments 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 56c44c6..bb23a7b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -25,26 +25,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 -5eafa4cb4c494383910647f01190f809892e17d39f75c31e039797794ba9ca5e +e42c5862efcd529656c446dd53720f561c7958b7c4e3b7fedafa3f71c5992be4
diff --git a/a/1.txt b/N2/1.txt index 36864d8..4eb18d0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -11,24 +11,23 @@ v3: Modified subject and changelog comments 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 56c44c6..22abe5d 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 v3] clk: s3c2410: removed unneeded variable in s3c24xx_clkout_set_parent\0" "Date\0Mon, 30 Nov 2015 10:08:46 +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" @@ -25,26 +17,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 -5eafa4cb4c494383910647f01190f809892e17d39f75c31e039797794ba9ca5e +d0bc66d38fe5b738b20aa09813cf964f85bbb0af6a82860efbe655e317aec477
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.