diff for duplicates of <1488965157.2514.10.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index 26f9753..63f8eae 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,8 +3,8 @@ On Wed, 2017-03-08 at 07:42 +0100, Heiner Kallweit wrote: > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- -> ?drivers/i2c/busses/i2c-meson.c | 10 +++++----- -> ?1 file changed, 5 insertions(+), 5 deletions(-) +> drivers/i2c/busses/i2c-meson.c | 10 +++++----- +> 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c- > meson.c @@ -13,42 +13,42 @@ On Wed, 2017-03-08 at 07:42 +0100, Heiner Kallweit wrote: > +++ b/drivers/i2c/busses/i2c-meson.c > @@ -156,10 +156,10 @@ static void meson_i2c_get_data(struct meson_i2c > *i2c, char *buf, int len) -> ? dev_dbg(i2c->dev, "%s: data %08x %08x len %d\n", __func__, -> ? rdata0, rdata1, len); -> ? +> dev_dbg(i2c->dev, "%s: data %08x %08x len %d\n", __func__, +> rdata0, rdata1, len); +> > - for (i = 0; i < min_t(int, 4, len); i++) > + for (i = 0; i < min(4, len); i++) -> ? *buf++ = (rdata0 >> i * 8) & 0xff; -> ? +> *buf++ = (rdata0 >> i * 8) & 0xff; +> > - for (i = 4; i < min_t(int, 8, len); i++) > + for (i = 4; i < min(8, len); i++) -> ? *buf++ = (rdata1 >> (i - 4) * 8) & 0xff; -> ?} -> ? +> *buf++ = (rdata1 >> (i - 4) * 8) & 0xff; +> } +> > @@ -168,10 +168,10 @@ static void meson_i2c_put_data(struct meson_i2c > *i2c, char *buf, int len) -> ? u32 wdata0 = 0, wdata1 = 0; -> ? int i; -> ? +> u32 wdata0 = 0, wdata1 = 0; +> int i; +> > - for (i = 0; i < min_t(int, 4, len); i++) > + for (i = 0; i < min(4, len); i++) -> ? wdata0 |= *buf++ << (i * 8); -> ? +> wdata0 |= *buf++ << (i * 8); +> > - for (i = 4; i < min_t(int, 8, len); i++) > + for (i = 4; i < min(8, len); i++) -> ? wdata1 |= *buf++ << ((i - 4) * 8); -> ? -> ? writel(wdata0, i2c->regs + REG_TOK_WDATA0); +> wdata1 |= *buf++ << ((i - 4) * 8); +> +> writel(wdata0, i2c->regs + REG_TOK_WDATA0); > @@ -186,7 +186,7 @@ static void meson_i2c_prepare_xfer(struct > meson_i2c *i2c) -> ? bool write = !(i2c->msg->flags & I2C_M_RD); -> ? int i; -> ? +> bool write = !(i2c->msg->flags & I2C_M_RD); +> int i; +> > - i2c->count = min_t(int, i2c->msg->len - i2c->pos, 8); > + i2c->count = min(i2c->msg->len - i2c->pos, 8); -> ? -> ? for (i = 0; i < i2c->count - 1; i++) -> ? meson_i2c_add_token(i2c, TOKEN_DATA); +> +> for (i = 0; i < i2c->count - 1; i++) +> meson_i2c_add_token(i2c, TOKEN_DATA); Since the second argument of min is always a constant, this patch does not change anything, but it doesn't hurt either. I suppose it is OK diff --git a/a/content_digest b/N1/content_digest index 37aa168..6b32414 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,12 @@ "ref\0d5f0545a-fb4c-b436-20f5-7df9d10605b1@gmail.com\0" "ref\0c1a3b573-bb03-059a-ee7a-77903d2aebfe@gmail.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH 01/12] i2c: meson: use min instead of min_t where min_t isn't needed\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH 01/12] i2c: meson: use min instead of min_t where min_t isn't needed\0" "Date\0Wed, 08 Mar 2017 10:25:57 +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:42 +0100, Heiner Kallweit wrote:\n" @@ -11,8 +14,8 @@ "> \n" "> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>\n" "> ---\n" - "> ?drivers/i2c/busses/i2c-meson.c | 10 +++++-----\n" - "> ?1 file changed, 5 insertions(+), 5 deletions(-)\n" + "> \302\240drivers/i2c/busses/i2c-meson.c | 10 +++++-----\n" + "> \302\2401 file changed, 5 insertions(+), 5 deletions(-)\n" "> \n" "> diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-\n" "> meson.c\n" @@ -21,44 +24,44 @@ "> +++ b/drivers/i2c/busses/i2c-meson.c\n" "> @@ -156,10 +156,10 @@ static void meson_i2c_get_data(struct meson_i2c\n" "> *i2c, char *buf, int len)\n" - "> ?\tdev_dbg(i2c->dev, \"%s: data %08x %08x len %d\\n\", __func__,\n" - "> ?\t\trdata0, rdata1, len);\n" - "> ?\n" + "> \302\240\tdev_dbg(i2c->dev, \"%s: data %08x %08x len %d\\n\", __func__,\n" + "> \302\240\t\trdata0, rdata1, len);\n" + "> \302\240\n" "> -\tfor (i = 0; i < min_t(int, 4, len); i++)\n" "> +\tfor (i = 0; i < min(4, len); i++)\n" - "> ?\t\t*buf++ = (rdata0 >> i * 8) & 0xff;\n" - "> ?\n" + "> \302\240\t\t*buf++ = (rdata0 >> i * 8) & 0xff;\n" + "> \302\240\n" "> -\tfor (i = 4; i < min_t(int, 8, len); i++)\n" "> +\tfor (i = 4; i < min(8, len); i++)\n" - "> ?\t\t*buf++ = (rdata1 >> (i - 4) * 8) & 0xff;\n" - "> ?}\n" - "> ?\n" + "> \302\240\t\t*buf++ = (rdata1 >> (i - 4) * 8) & 0xff;\n" + "> \302\240}\n" + "> \302\240\n" "> @@ -168,10 +168,10 @@ static void meson_i2c_put_data(struct meson_i2c\n" "> *i2c, char *buf, int len)\n" - "> ?\tu32 wdata0 = 0, wdata1 = 0;\n" - "> ?\tint i;\n" - "> ?\n" + "> \302\240\tu32 wdata0 = 0, wdata1 = 0;\n" + "> \302\240\tint i;\n" + "> \302\240\n" "> -\tfor (i = 0; i < min_t(int, 4, len); i++)\n" "> +\tfor (i = 0; i < min(4, len); i++)\n" - "> ?\t\twdata0 |= *buf++ << (i * 8);\n" - "> ?\n" + "> \302\240\t\twdata0 |= *buf++ << (i * 8);\n" + "> \302\240\n" "> -\tfor (i = 4; i < min_t(int, 8, len); i++)\n" "> +\tfor (i = 4; i < min(8, len); i++)\n" - "> ?\t\twdata1 |= *buf++ << ((i - 4) * 8);\n" - "> ?\n" - "> ?\twritel(wdata0, i2c->regs + REG_TOK_WDATA0);\n" + "> \302\240\t\twdata1 |= *buf++ << ((i - 4) * 8);\n" + "> \302\240\n" + "> \302\240\twritel(wdata0, i2c->regs + REG_TOK_WDATA0);\n" "> @@ -186,7 +186,7 @@ static void meson_i2c_prepare_xfer(struct\n" "> meson_i2c *i2c)\n" - "> ?\tbool write = !(i2c->msg->flags & I2C_M_RD);\n" - "> ?\tint i;\n" - "> ?\n" + "> \302\240\tbool write = !(i2c->msg->flags & I2C_M_RD);\n" + "> \302\240\tint i;\n" + "> \302\240\n" "> -\ti2c->count = min_t(int, i2c->msg->len - i2c->pos, 8);\n" "> +\ti2c->count = min(i2c->msg->len - i2c->pos, 8);\n" - "> ?\n" - "> ?\tfor (i = 0; i < i2c->count - 1; i++)\n" - "> ?\t\tmeson_i2c_add_token(i2c, TOKEN_DATA);\n" + "> \302\240\n" + "> \302\240\tfor (i = 0; i < i2c->count - 1; i++)\n" + "> \302\240\t\tmeson_i2c_add_token(i2c, TOKEN_DATA);\n" "\n" "Since the second argument of min is always a constant, this patch does\n" not change anything, but it doesn't hurt either. I suppose it is OK -2a5cac0ae635d592e18899d894dfc3b942bc5f07b5f6c61302ab75b8d44116eb +a2136bd34ee6233ca75f865ca3079a8a923fac26d97c09858294b86ef5db74f0
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.