diff for duplicates of <1484558690.2133.132.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 9303fbc..8b4d9cf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,35 +18,35 @@ what you state in commit message here? > > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > --- -> ?drivers/spi/spi-pxa2xx.c | 50 +++++++++++++++++++++++++++---------- +> drivers/spi/spi-pxa2xx.c | 50 +++++++++++++++++++++++++++---------- > ----------- -> ?1 file changed, 28 insertions(+), 22 deletions(-) +> 1 file changed, 28 insertions(+), 22 deletions(-) > > diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c > index dd7b5b4..24bf549 100644 > --- a/drivers/spi/spi-pxa2xx.c > +++ b/drivers/spi/spi-pxa2xx.c > @@ -737,6 +737,7 @@ static irqreturn_t ssp_int(int irq, void *dev_id) -> ? struct driver_data *drv_data = dev_id; -> ? u32 sccr1_reg; -> ? u32 mask = drv_data->mask_sr; +> struct driver_data *drv_data = dev_id; +> u32 sccr1_reg; +> u32 mask = drv_data->mask_sr; > + irqreturn_t ret = IRQ_NONE; -> ? u32 status; -> ? -> ? /* +> u32 status; +> +> /* > @@ -760,37 +761,42 @@ static irqreturn_t ssp_int(int irq, void > *dev_id) -> ? -> ? sccr1_reg = pxa2xx_spi_read(drv_data, SSCR1); -> ? +> +> sccr1_reg = pxa2xx_spi_read(drv_data, SSCR1); +> > - /* Ignore possible writes if we don't need to write */ > - if (!(sccr1_reg & SSCR1_TIE)) > - mask &= ~SSSR_TFS; > - -> ? /* Ignore RX timeout interrupt if it is disabled */ -> ? if (!(sccr1_reg & SSCR1_TINTE)) -> ? mask &= ~SSSR_TINT; -> ? +> /* Ignore RX timeout interrupt if it is disabled */ +> if (!(sccr1_reg & SSCR1_TINTE)) +> mask &= ~SSSR_TINT; +> > - if (!(status & mask)) > - return IRQ_NONE; > + while (1) { @@ -54,43 +54,43 @@ what you state in commit message here? > */ > + if (!(sccr1_reg & SSCR1_TIE)) > + mask &= ~SSSR_TFS; -> ? +> > - if (!drv_data->master->cur_msg) { > + if (!(status & mask)) > + return ret; -> ? +> > - pxa2xx_spi_write(drv_data, SSCR0, -> - ?pxa2xx_spi_read(drv_data, SSCR0) -> - ?& ~SSCR0_SSE); +> - pxa2xx_spi_read(drv_data, SSCR0) +> - & ~SSCR0_SSE); > - pxa2xx_spi_write(drv_data, SSCR1, -> - ?pxa2xx_spi_read(drv_data, SSCR1) -> - ?& ~drv_data->int_cr1); +> - pxa2xx_spi_read(drv_data, SSCR1) +> - & ~drv_data->int_cr1); > - if (!pxa25x_ssp_comp(drv_data)) > - pxa2xx_spi_write(drv_data, SSTO, 0); > - write_SSSR_CS(drv_data, drv_data->clear_sr); > + if (!drv_data->master->cur_msg) { -> ? +> > - dev_err(&drv_data->pdev->dev, > - "bad message state in interrupt handler\n"); > + pxa2xx_spi_write(drv_data, SSCR0, -> + ?pxa2xx_spi_read(drv_data, +> + pxa2xx_spi_read(drv_data, > SSCR0) -> + ?& ~SSCR0_SSE); +> + & ~SSCR0_SSE); > + pxa2xx_spi_write(drv_data, SSCR1, -> + ?pxa2xx_spi_read(drv_data, +> + pxa2xx_spi_read(drv_data, > SSCR1) -> + ?& ~drv_data->int_cr1); +> + & ~drv_data->int_cr1); > + if (!pxa25x_ssp_comp(drv_data)) > + pxa2xx_spi_write(drv_data, SSTO, 0); > + write_SSSR_CS(drv_data, drv_data->clear_sr); -> ? +> > - /* Never fail */ > - return IRQ_HANDLED; > - } > + dev_err(&drv_data->pdev->dev, > + "bad message state in interrupt > handler\n"); -> ? +> > - return drv_data->transfer_handler(drv_data); > + /* Never fail */ > + return IRQ_HANDLED; @@ -101,9 +101,9 @@ what you state in commit message here? > + status = pxa2xx_spi_read(drv_data, SSSR); > + sccr1_reg = pxa2xx_spi_read(drv_data, SSCR1); > + } -> ?} -> ? -> ?/* +> } +> +> /* -- Andy Shevchenko <andriy.shevchenko@linux.intel.com> diff --git a/a/content_digest b/N1/content_digest index 19bcbd2..7a9993d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,17 @@ "ref\0cover.1484557560.git.jan.kiszka@siemens.com\0" "ref\06fe26505e67790b27eed28fd7451b51e70b7e8ba.1484557560.git.jan.kiszka@siemens.com\0" - "From\0andriy.shevchenko@linux.intel.com (Andy Shevchenko)\0" - "Subject\0[PATCH 1/2] spi: pxa2xx: Prepare for edge-triggered interrupts\0" + "From\0Andy Shevchenko <andriy.shevchenko@linux.intel.com>\0" + "Subject\0Re: [PATCH 1/2] spi: pxa2xx: Prepare for edge-triggered interrupts\0" "Date\0Mon, 16 Jan 2017 11:24:50 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jan Kiszka <jan.kiszka@siemens.com>" + " linux-arm-kernel@lists.infradead.org\0" + "Cc\0Daniel Mack <daniel@zonque.org>" + Haojian Zhuang <haojian.zhuang@gmail.com> + Robert Jarzmik <robert.jarzmik@free.fr> + linux-kernel@vger.kernel.org + Mika Westerberg <mika.westerberg@linux.intel.com> + Jarkko Nikula <jarkko.nikula@bitmer.com> + " Sascha Weisenberger <sascha.weisenberger@siemens.com>\0" "\00:1\0" "b\0" "On Mon, 2017-01-16 at 10:05 +0100, Jan Kiszka wrote:\n" @@ -26,35 +34,35 @@ "> \n" "> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>\n" "> ---\n" - "> ?drivers/spi/spi-pxa2xx.c | 50 +++++++++++++++++++++++++++----------\n" + "> \302\240drivers/spi/spi-pxa2xx.c | 50 +++++++++++++++++++++++++++----------\n" "> -----------\n" - "> ?1 file changed, 28 insertions(+), 22 deletions(-)\n" + "> \302\2401 file changed, 28 insertions(+), 22 deletions(-)\n" "> \n" "> diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c\n" "> index dd7b5b4..24bf549 100644\n" "> --- a/drivers/spi/spi-pxa2xx.c\n" "> +++ b/drivers/spi/spi-pxa2xx.c\n" "> @@ -737,6 +737,7 @@ static irqreturn_t ssp_int(int irq, void *dev_id)\n" - "> ?\tstruct driver_data *drv_data = dev_id;\n" - "> ?\tu32 sccr1_reg;\n" - "> ?\tu32 mask = drv_data->mask_sr;\n" + "> \302\240\tstruct driver_data *drv_data = dev_id;\n" + "> \302\240\tu32 sccr1_reg;\n" + "> \302\240\tu32 mask = drv_data->mask_sr;\n" "> +\tirqreturn_t ret = IRQ_NONE;\n" - "> ?\tu32 status;\n" - "> ?\n" - "> ?\t/*\n" + "> \302\240\tu32 status;\n" + "> \302\240\n" + "> \302\240\t/*\n" "> @@ -760,37 +761,42 @@ static irqreturn_t ssp_int(int irq, void\n" "> *dev_id)\n" - "> ?\n" - "> ?\tsccr1_reg = pxa2xx_spi_read(drv_data, SSCR1);\n" - "> ?\n" + "> \302\240\n" + "> \302\240\tsccr1_reg = pxa2xx_spi_read(drv_data, SSCR1);\n" + "> \302\240\n" "> -\t/* Ignore possible writes if we don't need to write */\n" "> -\tif (!(sccr1_reg & SSCR1_TIE))\n" "> -\t\tmask &= ~SSSR_TFS;\n" "> -\n" - "> ?\t/* Ignore RX timeout interrupt if it is disabled */\n" - "> ?\tif (!(sccr1_reg & SSCR1_TINTE))\n" - "> ?\t\tmask &= ~SSSR_TINT;\n" - "> ?\n" + "> \302\240\t/* Ignore RX timeout interrupt if it is disabled */\n" + "> \302\240\tif (!(sccr1_reg & SSCR1_TINTE))\n" + "> \302\240\t\tmask &= ~SSSR_TINT;\n" + "> \302\240\n" "> -\tif (!(status & mask))\n" "> -\t\treturn IRQ_NONE;\n" "> +\twhile (1) {\n" @@ -62,43 +70,43 @@ "> */\n" "> +\t\tif (!(sccr1_reg & SSCR1_TIE))\n" "> +\t\t\tmask &= ~SSSR_TFS;\n" - "> ?\n" + "> \302\240\n" "> -\tif (!drv_data->master->cur_msg) {\n" "> +\t\tif (!(status & mask))\n" "> +\t\t\treturn ret;\n" - "> ?\n" + "> \302\240\n" "> -\t\tpxa2xx_spi_write(drv_data, SSCR0,\n" - "> -\t\t\t\t?pxa2xx_spi_read(drv_data, SSCR0)\n" - "> -\t\t\t\t?& ~SSCR0_SSE);\n" + "> -\t\t\t\t\302\240pxa2xx_spi_read(drv_data, SSCR0)\n" + "> -\t\t\t\t\302\240& ~SSCR0_SSE);\n" "> -\t\tpxa2xx_spi_write(drv_data, SSCR1,\n" - "> -\t\t\t\t?pxa2xx_spi_read(drv_data, SSCR1)\n" - "> -\t\t\t\t?& ~drv_data->int_cr1);\n" + "> -\t\t\t\t\302\240pxa2xx_spi_read(drv_data, SSCR1)\n" + "> -\t\t\t\t\302\240& ~drv_data->int_cr1);\n" "> -\t\tif (!pxa25x_ssp_comp(drv_data))\n" "> -\t\t\tpxa2xx_spi_write(drv_data, SSTO, 0);\n" "> -\t\twrite_SSSR_CS(drv_data, drv_data->clear_sr);\n" "> +\t\tif (!drv_data->master->cur_msg) {\n" - "> ?\n" + "> \302\240\n" "> -\t\tdev_err(&drv_data->pdev->dev,\n" "> -\t\t\t\"bad message state in interrupt handler\\n\");\n" "> +\t\t\tpxa2xx_spi_write(drv_data, SSCR0,\n" - "> +\t\t\t\t\t?pxa2xx_spi_read(drv_data,\n" + "> +\t\t\t\t\t\302\240pxa2xx_spi_read(drv_data,\n" "> SSCR0)\n" - "> +\t\t\t\t\t?& ~SSCR0_SSE);\n" + "> +\t\t\t\t\t\302\240& ~SSCR0_SSE);\n" "> +\t\t\tpxa2xx_spi_write(drv_data, SSCR1,\n" - "> +\t\t\t\t\t?pxa2xx_spi_read(drv_data,\n" + "> +\t\t\t\t\t\302\240pxa2xx_spi_read(drv_data,\n" "> SSCR1)\n" - "> +\t\t\t\t\t?& ~drv_data->int_cr1);\n" + "> +\t\t\t\t\t\302\240& ~drv_data->int_cr1);\n" "> +\t\t\tif (!pxa25x_ssp_comp(drv_data))\n" "> +\t\t\t\tpxa2xx_spi_write(drv_data, SSTO, 0);\n" "> +\t\t\twrite_SSSR_CS(drv_data, drv_data->clear_sr);\n" - "> ?\n" + "> \302\240\n" "> -\t\t/* Never fail */\n" "> -\t\treturn IRQ_HANDLED;\n" "> -\t}\n" "> +\t\t\tdev_err(&drv_data->pdev->dev,\n" "> +\t\t\t\t\"bad message state in interrupt\n" "> handler\\n\");\n" - "> ?\n" + "> \302\240\n" "> -\treturn drv_data->transfer_handler(drv_data);\n" "> +\t\t\t/* Never fail */\n" "> +\t\t\treturn IRQ_HANDLED;\n" @@ -109,12 +117,12 @@ "> +\t\tstatus = pxa2xx_spi_read(drv_data, SSSR);\n" "> +\t\tsccr1_reg = pxa2xx_spi_read(drv_data, SSCR1);\n" "> +\t}\n" - "> ?}\n" - "> ?\n" - "> ?/*\n" + "> \302\240}\n" + "> \302\240\n" + "> \302\240/*\n" "\n" "-- \n" "Andy Shevchenko <andriy.shevchenko@linux.intel.com>\n" Intel Finland Oy -db9cbf0db59eaab68261890f0bc522abebf7088baf468594103bf50f7c615f00 +a3141525e13178fc52c210ab55d4b81e3b8edf107502ceeebe304c253b47d5ee
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.