diff for duplicates of <1491145750.3480.3.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index ff52e61..f6894ab 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,26 +14,26 @@ Again, thanks for testing and fixing this Martin ! > Fixes: 1c50da4f27 ("clk: meson: add mpll support") > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > --- -> ?drivers/clk/meson/clk-mpll.c | 3 ++- -> ?1 file changed, 2 insertions(+), 1 deletion(-) +> drivers/clk/meson/clk-mpll.c | 3 ++- +> 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/meson/clk-mpll.c b/drivers/clk/meson/clk-mpll.c > index 551aa2a5b291..4306ad833a4f 100644 > --- a/drivers/clk/meson/clk-mpll.c > +++ b/drivers/clk/meson/clk-mpll.c > @@ -62,6 +62,7 @@ -> ? */ -> ? -> ?#include <linux/clk-provider.h> +> */ +> +> #include <linux/clk-provider.h> > +#include <linux/math64.h> -> ?#include "clkc.h" -> ? -> ?#define SDM_DEN 16384 +> #include "clkc.h" +> +> #define SDM_DEN 16384 > @@ -81,7 +82,7 @@ static unsigned long rate_from_params(unsigned long > parent_rate, -> ? if (divisor == 0) -> ? return 0; -> ? else +> if (divisor == 0) +> return 0; +> else > - return (parent_rate * SDM_DEN) / divisor; > + return mul_u64_u32_div(parent_rate, SDM_DEN, divisor); @@ -43,6 +43,6 @@ DIV_ROUND_UP_ULL((u64)foo, bar). See clk-divider.c. Would this be ok with you ? -> ?} -> ? -> ?static void params_from_rate(unsigned long requested_rate, +> } +> +> static void params_from_rate(unsigned long requested_rate, diff --git a/a/content_digest b/N1/content_digest index d17e9f4..6d593c4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,17 @@ "ref\020170401130225.8811-1-martin.blumenstingl@googlemail.com\0" "ref\020170401130225.8811-3-martin.blumenstingl@googlemail.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH 2/2] clk: meson: mpll: use 64bit math in rate_from_params\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH 2/2] clk: meson: mpll: use 64bit math in rate_from_params\0" "Date\0Sun, 02 Apr 2017 17:09:10 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Martin Blumenstingl <martin.blumenstingl@googlemail.com>" + linux-amlogic@lists.infradead.org + " linux-clk@vger.kernel.org\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + khilman@baylibre.com + carlo@caione.org + sboyd@codeaurora.org + mturquette@baylibre.com + " narmstrong@baylibre.com\0" "\00:1\0" "b\0" "On Sat, 2017-04-01 at 15:02 +0200, Martin Blumenstingl wrote:\n" @@ -22,26 +30,26 @@ "> Fixes: 1c50da4f27 (\"clk: meson: add mpll support\")\n" "> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>\n" "> ---\n" - "> ?drivers/clk/meson/clk-mpll.c | 3 ++-\n" - "> ?1 file changed, 2 insertions(+), 1 deletion(-)\n" + "> \302\240drivers/clk/meson/clk-mpll.c | 3 ++-\n" + "> \302\2401 file changed, 2 insertions(+), 1 deletion(-)\n" "> \n" "> diff --git a/drivers/clk/meson/clk-mpll.c b/drivers/clk/meson/clk-mpll.c\n" "> index 551aa2a5b291..4306ad833a4f 100644\n" "> --- a/drivers/clk/meson/clk-mpll.c\n" "> +++ b/drivers/clk/meson/clk-mpll.c\n" "> @@ -62,6 +62,7 @@\n" - "> ? */\n" - "> ?\n" - "> ?#include <linux/clk-provider.h>\n" + "> \302\240 */\n" + "> \302\240\n" + "> \302\240#include <linux/clk-provider.h>\n" "> +#include <linux/math64.h>\n" - "> ?#include \"clkc.h\"\n" - "> ?\n" - "> ?#define SDM_DEN 16384\n" + "> \302\240#include \"clkc.h\"\n" + "> \302\240\n" + "> \302\240#define SDM_DEN 16384\n" "> @@ -81,7 +82,7 @@ static unsigned long rate_from_params(unsigned long\n" "> parent_rate,\n" - "> ?\tif (divisor == 0)\n" - "> ?\t\treturn 0;\n" - "> ?\telse\n" + "> \302\240\tif (divisor == 0)\n" + "> \302\240\t\treturn 0;\n" + "> \302\240\telse\n" "> -\t\treturn (parent_rate * SDM_DEN) / divisor;\n" "> +\t\treturn mul_u64_u32_div(parent_rate, SDM_DEN, divisor);\n" "\n" @@ -51,8 +59,8 @@ "\n" "Would this be ok with you ?\n" "\n" - "> ?}\n" - "> ?\n" - > ?static void params_from_rate(unsigned long requested_rate, + "> \302\240}\n" + "> \302\240\n" + "> \302\240static void params_from_rate(unsigned long requested_rate," -e84603422137726c48b43c8cb30c2bc8a3fb6a89b83c53b9d650851b56ed9ff5 +e32161f9099c152cad3b888029f1d4d0c90375c5eea10ae618f9cb380c7ad673
diff --git a/a/content_digest b/N2/content_digest index d17e9f4..e871eab 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "From\0jbrunet@baylibre.com (Jerome Brunet)\0" "Subject\0[PATCH 2/2] clk: meson: mpll: use 64bit math in rate_from_params\0" "Date\0Sun, 02 Apr 2017 17:09:10 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Sat, 2017-04-01 at 15:02 +0200, Martin Blumenstingl wrote:\n" @@ -55,4 +55,4 @@ "> ?\n" > ?static void params_from_rate(unsigned long requested_rate, -e84603422137726c48b43c8cb30c2bc8a3fb6a89b83c53b9d650851b56ed9ff5 +9941d9691f1592a3c8a34d1b7eb08155da83dec761e997c775bb0627f18f2f8a
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.