| Message ID | 20210712085010.1.Ie3bb9f9d30d6475bb75251d32635194c1c72b9ee@changeid |
|---|---|
| State | Accepted |
| Commit | 57f1c12e455fc6c4c0db2c9f14e57b95822c2321 |
| Headers | show |
| Series | spi: spi-geni-qcom: Remove confusing comment about setting the watermark | expand |
On 12-07-21, 08:50, Douglas Anderson wrote: > The comment in setup_fifo_xfer() about setting the watermark wasn't > quite proper grammar and also stopped making sense around commit > 6d66507d9b55 ("spi: spi-geni-qcom: Don't wait to start 1st transfer if > transmitting"). After that commit we actually start the transfer > _before_ the watermark interrupt comes. > > I don't think the comment really has any value anymore. We've already > got a comment when we grab the spinlock saying that our interrupt can > come any time as a result of the things in the locked section. Let's > just remove it. Reviewed-by: Vinod Koul <vkoul@kernel.org> -- ~Vinod
On Mon, 12 Jul 2021 08:50:17 -0700, Douglas Anderson wrote: > The comment in setup_fifo_xfer() about setting the watermark wasn't > quite proper grammar and also stopped making sense around commit > 6d66507d9b55 ("spi: spi-geni-qcom: Don't wait to start 1st transfer if > transmitting"). After that commit we actually start the transfer > _before_ the watermark interrupt comes. > > I don't think the comment really has any value anymore. We've already > got a comment when we grab the spinlock saying that our interrupt can > come any time as a result of the things in the locked section. Let's > just remove it. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: spi-geni-qcom: Remove confusing comment about setting the watermark commit: 57f1c12e455fc6c4c0db2c9f14e57b95822c2321 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c index b3861fb88711..2f51421e2a71 100644 --- a/drivers/spi/spi-geni-qcom.c +++ b/drivers/spi/spi-geni-qcom.c @@ -549,12 +549,6 @@ static void setup_fifo_xfer(struct spi_transfer *xfer, */ spin_lock_irq(&mas->lock); geni_se_setup_m_cmd(se, m_cmd, FRAGMENTATION); - - /* - * TX_WATERMARK_REG should be set after SPI configuration and - * setting up GENI SE engine, as driver starts data transfer - * for the watermark interrupt. - */ if (m_cmd & SPI_TX_ONLY) { if (geni_spi_handle_tx(mas)) writel(mas->tx_wm, se->base + SE_GENI_TX_WATERMARK_REG);
The comment in setup_fifo_xfer() about setting the watermark wasn't quite proper grammar and also stopped making sense around commit 6d66507d9b55 ("spi: spi-geni-qcom: Don't wait to start 1st transfer if transmitting"). After that commit we actually start the transfer _before_ the watermark interrupt comes. I don't think the comment really has any value anymore. We've already got a comment when we grab the spinlock saying that our interrupt can come any time as a result of the things in the locked section. Let's just remove it. Signed-off-by: Douglas Anderson <dianders@chromium.org> --- drivers/spi/spi-geni-qcom.c | 6 ------ 1 file changed, 6 deletions(-)