diff for duplicates of <1488965330.2514.12.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index f34e890..fbd2a5a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,8 +5,8 @@ On Wed, 2017-03-08 at 07:46 +0100, Heiner Kallweit wrote: > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- -> ?drivers/i2c/busses/i2c-meson.c | 7 +++---- -> ?1 file changed, 3 insertions(+), 4 deletions(-) +> drivers/i2c/busses/i2c-meson.c | 7 +++---- +> 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c > index 594fec22..81304840 100644 @@ -14,15 +14,15 @@ On Wed, 2017-03-08 at 07:46 +0100, Heiner Kallweit wrote: > +++ b/drivers/i2c/busses/i2c-meson.c > @@ -364,20 +364,19 @@ static int meson_i2c_xfer(struct i2c_adapter *adap, > struct i2c_msg *msgs, -> ? ??int num) -> ?{ -> ? struct meson_i2c *i2c = adap->algo_data; +> int num) +> { +> struct meson_i2c *i2c = adap->algo_data; > - int i, ret = 0, count = 0; > + int i, ret = 0; -> ? -> ? clk_enable(i2c->clk); -> ? -> ? for (i = 0; i < num; i++) { +> +> clk_enable(i2c->clk); +> +> for (i = 0; i < num; i++) { > - ret = meson_i2c_xfer_msg(i2c, msgs + i, i == num - 1); > + ret = meson_i2c_xfer_msg(i2c, &msgs[i], i == num - 1); @@ -30,15 +30,15 @@ It's a matter of taste whether this is more readable. I personally prefer it the way it was. -> ? if (ret) -> ? break; +> if (ret) +> break; > - count++; -> ? } -> ? -> ? clk_disable(i2c->clk); -> ? +> } +> +> clk_disable(i2c->clk); +> > - return ret ? ret : count; > + return ret ?: i; -> ?} -> ? -> ?static u32 meson_i2c_func(struct i2c_adapter *adap) +> } +> +> static u32 meson_i2c_func(struct i2c_adapter *adap) diff --git a/a/content_digest b/N1/content_digest index 15f05b4..ba3153c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,12 @@ "ref\0d5f0545a-fb4c-b436-20f5-7df9d10605b1@gmail.com\0" "ref\095687966-387c-f9ba-ae0a-9b0258f7ad43@gmail.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH 06/12] i2c: meson: remove variable count from meson_i2c_xfer\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH 06/12] i2c: meson: remove variable count from meson_i2c_xfer\0" "Date\0Wed, 08 Mar 2017 10:28:50 +0100\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Heiner Kallweit <hkallweit1@gmail.com>" + " Wolfram Sang <wsa@the-dreams.de>\0" + "Cc\0linux-amlogic@lists.infradead.org" + " linux-i2c@vger.kernel.org <linux-i2c@vger.kernel.org>\0" "\00:1\0" "b\0" "On Wed, 2017-03-08 at 07:46 +0100, Heiner Kallweit wrote:\n" @@ -13,8 +16,8 @@ "> \n" "> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>\n" "> ---\n" - "> ?drivers/i2c/busses/i2c-meson.c | 7 +++----\n" - "> ?1 file changed, 3 insertions(+), 4 deletions(-)\n" + "> \302\240drivers/i2c/busses/i2c-meson.c | 7 +++----\n" + "> \302\2401 file changed, 3 insertions(+), 4 deletions(-)\n" "> \n" "> diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c\n" "> index 594fec22..81304840 100644\n" @@ -22,15 +25,15 @@ "> +++ b/drivers/i2c/busses/i2c-meson.c\n" "> @@ -364,20 +364,19 @@ static int meson_i2c_xfer(struct i2c_adapter *adap,\n" "> struct i2c_msg *msgs,\n" - "> ?\t\t\t??int num)\n" - "> ?{\n" - "> ?\tstruct meson_i2c *i2c = adap->algo_data;\n" + "> \302\240\t\t\t\302\240\302\240int num)\n" + "> \302\240{\n" + "> \302\240\tstruct meson_i2c *i2c = adap->algo_data;\n" "> -\tint i, ret = 0, count = 0;\n" "> +\tint i, ret = 0;\n" - "> ?\n" - "> ?\tclk_enable(i2c->clk);\n" - "> ?\n" - "> ?\tfor (i = 0; i < num; i++) {\n" + "> \302\240\n" + "> \302\240\tclk_enable(i2c->clk);\n" + "> \302\240\n" + "> \302\240\tfor (i = 0; i < num; i++) {\n" "> -\t\tret = meson_i2c_xfer_msg(i2c, msgs + i, i == num - 1);\n" "> +\t\tret = meson_i2c_xfer_msg(i2c, &msgs[i], i == num - 1);\n" "\n" @@ -38,17 +41,17 @@ "way it was.\n" "\n" "\n" - "> ?\t\tif (ret)\n" - "> ?\t\t\tbreak;\n" + "> \302\240\t\tif (ret)\n" + "> \302\240\t\t\tbreak;\n" "> -\t\tcount++;\n" - "> ?\t}\n" - "> ?\n" - "> ?\tclk_disable(i2c->clk);\n" - "> ?\n" + "> \302\240\t}\n" + "> \302\240\n" + "> \302\240\tclk_disable(i2c->clk);\n" + "> \302\240\n" "> -\treturn ret ? ret : count;\n" "> +\treturn ret ?: i;\n" - "> ?}\n" - "> ?\n" - > ?static u32 meson_i2c_func(struct i2c_adapter *adap) + "> \302\240}\n" + "> \302\240\n" + "> \302\240static u32 meson_i2c_func(struct i2c_adapter *adap)" -772d0e32c9aa37eceae39d563dc2a7918b22a8da4baeb13dd7d928e8f8441636 +e81b1c6af425619008f5d2ec47f37b0cce3104a168fe2287755364acec721fbb
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.