diff for duplicates of <1488966636.2514.16.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index 83322d4..080c685 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,17 +7,17 @@ On Wed, 2017-03-08 at 07:47 +0100, Heiner Kallweit wrote: > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- -> ?drivers/i2c/busses/i2c-meson.c | 16 +++++++++------- -> ?1 file changed, 9 insertions(+), 7 deletions(-) +> drivers/i2c/busses/i2c-meson.c | 16 +++++++++------- +> 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c > index 81304840..b3b881f9 100644 > --- a/drivers/i2c/busses/i2c-meson.c > +++ b/drivers/i2c/busses/i2c-meson.c > @@ -233,7 +233,15 @@ static irqreturn_t meson_i2c_irq(int irqno, void *dev_id) -> ? dev_dbg(i2c->dev, "irq: state %d, pos %d, count %d, ctrl %08x\n", -> ? i2c->state, i2c->pos, i2c->count, ctrl); -> ? +> dev_dbg(i2c->dev, "irq: state %d, pos %d, count %d, ctrl %08x\n", +> i2c->state, i2c->pos, i2c->count, ctrl); +> > - if (ctrl & REG_CTRL_ERROR && i2c->state != STATE_IDLE) { > + meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, 0); > + @@ -36,34 +36,34 @@ interrupt handler. > + > + if (ctrl & REG_CTRL_ERROR) { -> ? /* -> ? ?* The bit is set when the IGNORE_NAK bit is cleared -> ? ?* and the device didn't respond. In this case, the +> /* +> * The bit is set when the IGNORE_NAK bit is cleared +> * and the device didn't respond. In this case, the > @@ -276,15 +284,12 @@ static irqreturn_t meson_i2c_irq(int irqno, void > *dev_id) -> ? i2c->state = STATE_IDLE; -> ? complete(&i2c->done); -> ? break; +> i2c->state = STATE_IDLE; +> complete(&i2c->done); +> break; > - case STATE_IDLE: > - break; -> ? } -> ? -> ?out: -> ? if (i2c->state != STATE_IDLE) { -> ? /* Restart the processing */ -> ? meson_i2c_write_tokens(i2c); +> } +> +> out: +> if (i2c->state != STATE_IDLE) { +> /* Restart the processing */ +> meson_i2c_write_tokens(i2c); > - meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, 0); -> ? meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, -> ? ???REG_CTRL_START); -> ? } +> meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, +> REG_CTRL_START); +> } > @@ -344,9 +349,6 @@ static int meson_i2c_xfer_msg(struct meson_i2c *i2c, > struct i2c_msg *msg, -> ? ?*/ -> ? spin_lock_irqsave(&i2c->lock, flags); -> ? +> */ +> spin_lock_irqsave(&i2c->lock, flags); +> > - /* Abort any active operation */ > - meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, 0); > - -> ? if (!time_left) { -> ? i2c->state = STATE_IDLE; -> ? ret = -ETIMEDOUT; +> if (!time_left) { +> i2c->state = STATE_IDLE; +> ret = -ETIMEDOUT; diff --git a/a/content_digest b/N1/content_digest index bb61142..106a04b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,12 @@ "ref\0d5f0545a-fb4c-b436-20f5-7df9d10605b1@gmail.com\0" "ref\0c772d1d8-eaae-43c2-c206-7c349c134db8@gmail.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH 07/12] i2c: meson: improve interrupt handler and detect spurious interrupts\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH 07/12] i2c: meson: improve interrupt handler and detect spurious interrupts\0" "Date\0Wed, 08 Mar 2017 10:50:36 +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:47 +0100, Heiner Kallweit wrote:\n" @@ -15,17 +18,17 @@ "> \n" "> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>\n" "> ---\n" - "> ?drivers/i2c/busses/i2c-meson.c | 16 +++++++++-------\n" - "> ?1 file changed, 9 insertions(+), 7 deletions(-)\n" + "> \302\240drivers/i2c/busses/i2c-meson.c | 16 +++++++++-------\n" + "> \302\2401 file changed, 9 insertions(+), 7 deletions(-)\n" "> \n" "> diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c\n" "> index 81304840..b3b881f9 100644\n" "> --- a/drivers/i2c/busses/i2c-meson.c\n" "> +++ b/drivers/i2c/busses/i2c-meson.c\n" "> @@ -233,7 +233,15 @@ static irqreturn_t meson_i2c_irq(int irqno, void *dev_id)\n" - "> ?\tdev_dbg(i2c->dev, \"irq: state %d, pos %d, count %d, ctrl %08x\\n\",\n" - "> ?\t\ti2c->state, i2c->pos, i2c->count, ctrl);\n" - "> ?\n" + "> \302\240\tdev_dbg(i2c->dev, \"irq: state %d, pos %d, count %d, ctrl %08x\\n\",\n" + "> \302\240\t\ti2c->state, i2c->pos, i2c->count, ctrl);\n" + "> \302\240\n" "> -\tif (ctrl & REG_CTRL_ERROR && i2c->state != STATE_IDLE) {\n" "> +\tmeson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, 0);\n" "> +\n" @@ -44,36 +47,36 @@ "\n" "> +\n" "> +\tif (ctrl & REG_CTRL_ERROR) {\n" - "> ?\t\t/*\n" - "> ?\t\t?* The bit is set when the IGNORE_NAK bit is cleared\n" - "> ?\t\t?* and the device didn't respond. In this case, the\n" + "> \302\240\t\t/*\n" + "> \302\240\t\t\302\240* The bit is set when the IGNORE_NAK bit is cleared\n" + "> \302\240\t\t\302\240* and the device didn't respond. In this case, the\n" "> @@ -276,15 +284,12 @@ static irqreturn_t meson_i2c_irq(int irqno, void\n" "> *dev_id)\n" - "> ?\t\ti2c->state = STATE_IDLE;\n" - "> ?\t\tcomplete(&i2c->done);\n" - "> ?\t\tbreak;\n" + "> \302\240\t\ti2c->state = STATE_IDLE;\n" + "> \302\240\t\tcomplete(&i2c->done);\n" + "> \302\240\t\tbreak;\n" "> -\tcase STATE_IDLE:\n" "> -\t\tbreak;\n" - "> ?\t}\n" - "> ?\n" - "> ?out:\n" - "> ?\tif (i2c->state != STATE_IDLE) {\n" - "> ?\t\t/* Restart the processing */\n" - "> ?\t\tmeson_i2c_write_tokens(i2c);\n" + "> \302\240\t}\n" + "> \302\240\n" + "> \302\240out:\n" + "> \302\240\tif (i2c->state != STATE_IDLE) {\n" + "> \302\240\t\t/* Restart the processing */\n" + "> \302\240\t\tmeson_i2c_write_tokens(i2c);\n" "> -\t\tmeson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, 0);\n" - "> ?\t\tmeson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START,\n" - "> ?\t\t\t\t???REG_CTRL_START);\n" - "> ?\t}\n" + "> \302\240\t\tmeson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START,\n" + "> \302\240\t\t\t\t\302\240\302\240\302\240REG_CTRL_START);\n" + "> \302\240\t}\n" "> @@ -344,9 +349,6 @@ static int meson_i2c_xfer_msg(struct meson_i2c *i2c,\n" "> struct i2c_msg *msg,\n" - "> ?\t?*/\n" - "> ?\tspin_lock_irqsave(&i2c->lock, flags);\n" - "> ?\n" + "> \302\240\t\302\240*/\n" + "> \302\240\tspin_lock_irqsave(&i2c->lock, flags);\n" + "> \302\240\n" "> -\t/* Abort any active operation */\n" "> -\tmeson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, 0);\n" "> -\n" - "> ?\tif (!time_left) {\n" - "> ?\t\ti2c->state = STATE_IDLE;\n" - "> ?\t\tret = -ETIMEDOUT;" + "> \302\240\tif (!time_left) {\n" + "> \302\240\t\ti2c->state = STATE_IDLE;\n" + "> \302\240\t\tret = -ETIMEDOUT;" -b62a82a1605662e028358b40a26ebcdc44de55d50d46654d700348d123b2d9ea +9c3537ba912c33ba5e5260a2268d5edb87f61841179a0711b16927d3797c82fa
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.