diff for duplicates of <20150603232141.6017.18339@quantum> diff --git a/a/1.txt b/N1/1.txt index a6fd9d9..63038bc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,26 +1,35 @@ Quoting Dinh Nguyen (2015-05-27 06:21:56) -> -> +> = + +> = + > On 5/27/15 3:26 AM, Dan Carpenter wrote: > > This line was indented too far. -> > +> > = + > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> -> > -> > diff --git a/drivers/clk/socfpga/clk-gate-a10.c b/drivers/clk/socfpga/clk-gate-a10.c +> > = + +> > diff --git a/drivers/clk/socfpga/clk-gate-a10.c b/drivers/clk/socfpga/c= +lk-gate-a10.c > > index be3e998..83c6780 100644 > > --- a/drivers/clk/socfpga/clk-gate-a10.c > > +++ b/drivers/clk/socfpga/clk-gate-a10.c -> > @@ -39,7 +39,7 @@ static unsigned long socfpga_gate_clk_recalc_rate(struct clk_hw *hwclk, +> > @@ -39,7 +39,7 @@ static unsigned long socfpga_gate_clk_recalc_rate(str= +uct clk_hw *hwclk, > > else if (socfpgaclk->div_reg) { -> > val = readl(socfpgaclk->div_reg) >> socfpgaclk->shift; -> > val &= div_mask(socfpgaclk->width); -> > - div = (1 << val); -> > + div = (1 << val); +> > val =3D readl(socfpgaclk->div_reg) >> socfpgaclk->shift; +> > val &=3D div_mask(socfpgaclk->width); +> > - div =3D (1 << val); +> > + div =3D (1 << val); > > } -> > +> > = + > > return parent_rate / div; -> > -> +> > = + +> = + > Acked-by: Dinh Nguyen <dinguyen@opensource.altera.com> Applied. diff --git a/a/content_digest b/N1/content_digest index 7e71636..ecdabfd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\05565C4F4.7090805@opensource.altera.com\0" "From\0Michael Turquette <mturquette@linaro.org>\0" "Subject\0Re: [patch] clk: socfpga: remove a stray tab\0" - "Date\0Wed, 03 Jun 2015 23:21:41 +0000\0" + "Date\0Wed, 03 Jun 2015 16:21:41 -0700\0" "To\0Dinh Nguyen <dinguyen@opensource.altera.com>" " Dan Carpenter <dan.carpenter@oracle.com>\0" "Cc\0Stephen Boyd <sboyd@codeaurora.org>" @@ -11,28 +11,37 @@ "\00:1\0" "b\0" "Quoting Dinh Nguyen (2015-05-27 06:21:56)\n" - "> \n" - "> \n" + "> =\n" + "\n" + "> =\n" + "\n" "> On 5/27/15 3:26 AM, Dan Carpenter wrote:\n" "> > This line was indented too far.\n" - "> > \n" + "> > =\n" + "\n" "> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>\n" - "> > \n" - "> > diff --git a/drivers/clk/socfpga/clk-gate-a10.c b/drivers/clk/socfpga/clk-gate-a10.c\n" + "> > =\n" + "\n" + "> > diff --git a/drivers/clk/socfpga/clk-gate-a10.c b/drivers/clk/socfpga/c=\n" + "lk-gate-a10.c\n" "> > index be3e998..83c6780 100644\n" "> > --- a/drivers/clk/socfpga/clk-gate-a10.c\n" "> > +++ b/drivers/clk/socfpga/clk-gate-a10.c\n" - "> > @@ -39,7 +39,7 @@ static unsigned long socfpga_gate_clk_recalc_rate(struct clk_hw *hwclk,\n" + "> > @@ -39,7 +39,7 @@ static unsigned long socfpga_gate_clk_recalc_rate(str=\n" + "uct clk_hw *hwclk,\n" "> > else if (socfpgaclk->div_reg) {\n" - "> > val = readl(socfpgaclk->div_reg) >> socfpgaclk->shift;\n" - "> > val &= div_mask(socfpgaclk->width);\n" - "> > - div = (1 << val);\n" - "> > + div = (1 << val);\n" + "> > val =3D readl(socfpgaclk->div_reg) >> socfpgaclk->shift;\n" + "> > val &=3D div_mask(socfpgaclk->width);\n" + "> > - div =3D (1 << val);\n" + "> > + div =3D (1 << val);\n" "> > }\n" - "> > \n" + "> > =\n" + "\n" "> > return parent_rate / div;\n" - "> > \n" - "> \n" + "> > =\n" + "\n" + "> =\n" + "\n" "> Acked-by: Dinh Nguyen <dinguyen@opensource.altera.com>\n" "\n" "Applied.\n" @@ -40,4 +49,4 @@ "Regards,\n" Mike -7b78c128a7cc2774e90f9be91fbdc3a52566b72e0e08bc885eb48a8add5bae56 +1134c7ac8e5f0b6030a2650c97a2626f1d848fda5e37532ba41ff7e499b38042
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.