From: Thierry Reding <thierry.reding@gmail.com>
To: Dmitry Osipenko <digetx@gmail.com>
Cc: "Jonathan Hunter" <jonathanh@nvidia.com>,
"Laxman Dewangan" <ldewangan@nvidia.com>,
"Wolfram Sang" <wsa@the-dreams.de>,
"Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
"Andy Shevchenko" <andy.shevchenko@gmail.com>,
linux-i2c@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v7 33/34] i2c: tegra: Clean up whitespaces, newlines and indentation
Date: Thu, 17 Sep 2020 14:35:44 +0200 [thread overview]
Message-ID: <20200917123544.GL3515672@ulmo> (raw)
In-Reply-To: <20200908224006.25636-34-digetx@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 4139 bytes --]
On Wed, Sep 09, 2020 at 01:40:05AM +0300, Dmitry Osipenko wrote:
> Some places in the code are missing newlines or have unnecessary
> whitespaces and newlines. This creates inconsistency of the code and
> hurts readability. This patch removes the unnecessary and adds necessary
> whitespaces / newlines, clears indentation of the code.
>
> Reviewed-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
> ---
> drivers/i2c/busses/i2c-tegra.c | 72 +++++++++++++++++++++-------------
> 1 file changed, 45 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
> index 31fbc6181dd5..087f98010963 100644
> --- a/drivers/i2c/busses/i2c-tegra.c
> +++ b/drivers/i2c/busses/i2c-tegra.c
> @@ -314,6 +314,7 @@ static u32 tegra_i2c_reg_addr(struct tegra_i2c_dev *i2c_dev, u32 reg)
> reg += (reg >= I2C_TX_FIFO) ? 0x10 : 0x40;
> else if (i2c_dev->is_vi)
> reg = 0xc00 + (reg << 2);
> +
> return reg;
> }
>
> @@ -373,9 +374,12 @@ static int tegra_i2c_dma_submit(struct tegra_i2c_dev *i2c_dev, size_t len)
> struct dma_chan *chan;
>
> dev_dbg(i2c_dev->dev, "starting DMA for length: %zu\n", len);
> +
> reinit_completion(&i2c_dev->dma_complete);
> +
> dir = i2c_dev->msg_read ? DMA_DEV_TO_MEM : DMA_MEM_TO_DEV;
> chan = i2c_dev->msg_read ? i2c_dev->rx_dma_chan : i2c_dev->tx_dma_chan;
> +
> dma_desc = dmaengine_prep_slave_single(chan, i2c_dev->dma_phys,
> len, dir, DMA_PREP_INTERRUPT |
> DMA_CTRL_ACK);
> @@ -387,8 +391,10 @@ static int tegra_i2c_dma_submit(struct tegra_i2c_dev *i2c_dev, size_t len)
>
> dma_desc->callback = tegra_i2c_dma_complete;
> dma_desc->callback_param = i2c_dev;
> +
> dmaengine_submit(dma_desc);
> dma_async_issue_pending(chan);
> +
> return 0;
> }
>
> @@ -455,6 +461,7 @@ static int tegra_i2c_init_dma(struct tegra_i2c_dev *i2c_dev)
>
> i2c_dev->dma_buf = dma_buf;
> i2c_dev->dma_phys = dma_phys;
> +
> return 0;
>
> err_out:
> @@ -557,6 +564,7 @@ static int tegra_i2c_flush_fifos(struct tegra_i2c_dev *i2c_dev)
> dev_err(i2c_dev->dev, "failed to flush FIFO\n");
> return err;
> }
> +
> return 0;
> }
>
> @@ -650,8 +658,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
> if (i2c_dev->hw->has_interface_timing_reg && tsu_thd)
> i2c_writel(i2c_dev, tsu_thd, I2C_INTERFACE_TIMING_1);
>
> - clk_multiplier = tlow + thigh + 2;
> - clk_multiplier *= non_hs_mode + 1;
> + clk_multiplier = (tlow + thigh + 2) * (non_hs_mode + 1);
>
> err = clk_set_rate(i2c_dev->div_clk,
> i2c_dev->bus_clk_rate * clk_multiplier);
> @@ -799,9 +806,9 @@ static int tegra_i2c_fill_tx_fifo(struct tegra_i2c_dev *i2c_dev)
> */
> buf_remaining -= words_to_transfer * BYTES_PER_FIFO_WORD;
> tx_fifo_avail -= words_to_transfer;
> +
> i2c_dev->msg_buf_remaining = buf_remaining;
> - i2c_dev->msg_buf = buf +
> - words_to_transfer * BYTES_PER_FIFO_WORD;
> + i2c_dev->msg_buf = buf + words_to_transfer * BYTES_PER_FIFO_WORD;
>
> i2c_writesl(i2c_dev, buf, I2C_TX_FIFO, words_to_transfer);
>
> @@ -914,12 +921,18 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)
> goto done;
> err:
> /* mask all interrupts on error */
> - tegra_i2c_mask_irq(i2c_dev, I2C_INT_NO_ACK | I2C_INT_ARBITRATION_LOST |
> - I2C_INT_PACKET_XFER_COMPLETE | I2C_INT_TX_FIFO_DATA_REQ |
> - I2C_INT_RX_FIFO_DATA_REQ);
> + tegra_i2c_mask_irq(i2c_dev,
> + I2C_INT_NO_ACK |
> + I2C_INT_ARBITRATION_LOST |
> + I2C_INT_PACKET_XFER_COMPLETE |
> + I2C_INT_TX_FIFO_DATA_REQ |
> + I2C_INT_RX_FIFO_DATA_REQ);
This now seems inconsistent with the choice in other places in this
driver where we wrap only when necessary. I think it would be more
consistent to align the subsequent lines with the parameters on the
first line. Or alternatively assign to a local variable and pass that to
tegra_i2c_mask_irq().
But the above is fine with me as well:
Acked-by: Thierry Reding <treding@nvidia.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2020-09-17 12:40 UTC|newest]
Thread overview: 146+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-08 22:39 [PATCH v7 00/34] Improvements for Tegra I2C driver Dmitry Osipenko
2020-09-08 22:39 ` [PATCH v7 01/34] i2c: tegra: Make tegra_i2c_flush_fifos() usable in atomic transfer Dmitry Osipenko
2020-09-17 11:10 ` Thierry Reding
2020-09-17 14:57 ` Dmitry Osipenko
2020-09-21 10:18 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 02/34] i2c: tegra: Add missing pm_runtime_put() Dmitry Osipenko
2020-09-17 11:12 ` Thierry Reding
2020-09-21 10:18 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 03/34] i2c: tegra: Handle potential error of tegra_i2c_flush_fifos() Dmitry Osipenko
2020-09-17 11:13 ` Thierry Reding
2020-09-21 10:18 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 04/34] i2c: tegra: Mask interrupt in tegra_i2c_issue_bus_clear() Dmitry Osipenko
2020-09-17 11:18 ` Thierry Reding
2020-09-21 10:18 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 05/34] i2c: tegra: Initialize div-clk rate unconditionally Dmitry Osipenko
2020-09-17 11:20 ` Thierry Reding
2020-09-21 10:18 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 06/34] i2c: tegra: Remove i2c_dev.clk_divisor_non_hs_mode member Dmitry Osipenko
2020-09-17 11:25 ` Thierry Reding
2020-09-17 15:27 ` Dmitry Osipenko
2020-09-21 10:49 ` Thierry Reding
2020-09-21 10:18 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 07/34] i2c: tegra: Runtime PM always available on Tegra Dmitry Osipenko
2020-09-17 11:26 ` Thierry Reding
2020-09-21 10:18 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 08/34] i2c: tegra: Remove error message used for devm_request_irq() failure Dmitry Osipenko
2020-09-17 11:28 ` Thierry Reding
2020-09-17 14:59 ` Dmitry Osipenko
2020-09-21 10:57 ` Thierry Reding
2020-09-21 10:18 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 09/34] i2c: tegra: Use reset_control_reset() Dmitry Osipenko
2020-09-17 12:36 ` Thierry Reding
2020-09-21 10:19 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 10/34] i2c: tegra: Use devm_platform_get_and_ioremap_resource() Dmitry Osipenko
2020-09-17 11:31 ` Thierry Reding
2020-09-21 10:19 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 11/34] i2c: tegra: Use platform_get_irq() Dmitry Osipenko
2020-09-17 11:31 ` Thierry Reding
2020-09-21 10:19 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 12/34] i2c: tegra: Use clk-bulk helpers Dmitry Osipenko
2020-09-17 11:38 ` Thierry Reding
2020-09-17 13:54 ` Andy Shevchenko
2020-09-21 11:01 ` Thierry Reding
2020-09-21 11:15 ` Andy Shevchenko
2020-09-21 11:53 ` Thierry Reding
2020-09-17 15:01 ` Dmitry Osipenko
2020-09-21 11:08 ` Thierry Reding
2020-09-21 11:12 ` Thierry Reding
2020-09-21 14:44 ` Dmitry Osipenko
2020-09-21 10:19 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 13/34] i2c: tegra: Move out all device-tree parsing into tegra_i2c_parse_dt() Dmitry Osipenko
2020-09-17 11:35 ` Thierry Reding
2020-09-21 10:19 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 14/34] i2c: tegra: Clean up probe function Dmitry Osipenko
2020-09-17 12:37 ` Thierry Reding
2020-09-17 13:46 ` Andy Shevchenko
2020-09-21 11:15 ` Thierry Reding
2020-09-17 15:02 ` Dmitry Osipenko
2020-09-21 11:17 ` Thierry Reding
2020-09-21 10:19 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 15/34] i2c: tegra: Reorder location of functions in the code Dmitry Osipenko
2020-09-17 12:38 ` Thierry Reding
2020-09-21 10:19 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 16/34] i2c: tegra: Clean up variable types Dmitry Osipenko
2020-09-17 12:39 ` Thierry Reding
2020-09-21 10:19 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 17/34] i2c: tegra: Remove outdated barrier() Dmitry Osipenko
2020-09-17 12:39 ` Thierry Reding
2020-09-21 10:19 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 18/34] i2c: tegra: Remove likely/unlikely from the code Dmitry Osipenko
2020-09-17 12:41 ` Thierry Reding
2020-09-21 10:19 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 19/34] i2c: tegra: Remove redundant check in tegra_i2c_issue_bus_clear() Dmitry Osipenko
2020-09-17 12:42 ` Thierry Reding
2020-09-21 10:19 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 20/34] i2c: tegra: Remove "dma" variable from tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-17 11:44 ` Thierry Reding
2020-09-21 10:19 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 21/34] i2c: tegra: Don't fall back to PIO mode if DMA configuration fails Dmitry Osipenko
2020-09-17 11:47 ` Thierry Reding
2020-09-17 15:03 ` Dmitry Osipenko
2020-09-21 11:21 ` Thierry Reding
2020-09-21 10:19 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 22/34] i2c: tegra: Rename wait/poll functions Dmitry Osipenko
2020-09-17 11:48 ` Thierry Reding
2020-09-21 10:19 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 23/34] i2c: tegra: Factor out error recovery from tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-17 11:49 ` Thierry Reding
2020-09-21 10:20 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 24/34] i2c: tegra: Factor out packet header setup " Dmitry Osipenko
2020-09-17 11:51 ` Thierry Reding
2020-09-21 10:20 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 25/34] i2c: tegra: Factor out register polling into separate function Dmitry Osipenko
2020-09-17 11:58 ` Thierry Reding
2020-09-17 15:05 ` Dmitry Osipenko
2020-09-21 11:22 ` Thierry Reding
2020-09-21 10:20 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 26/34] i2c: tegra: Factor out hardware initialization " Dmitry Osipenko
2020-09-17 12:06 ` Thierry Reding
2020-09-21 10:20 ` Thierry Reding
2020-09-08 22:39 ` [PATCH v7 27/34] i2c: tegra: Check errors for both positive and negative values Dmitry Osipenko
2020-09-17 12:09 ` Thierry Reding
2020-09-17 13:50 ` Andy Shevchenko
2020-09-21 11:24 ` Thierry Reding
2020-09-21 14:13 ` Dmitry Osipenko
2020-09-21 10:20 ` Thierry Reding
2020-09-08 22:40 ` [PATCH v7 28/34] i2c: tegra: Consolidate error handling in tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-17 12:12 ` Thierry Reding
2020-09-21 10:20 ` Thierry Reding
2020-09-08 22:40 ` [PATCH v7 29/34] i2c: tegra: Improve formatting of variables Dmitry Osipenko
2020-09-17 12:16 ` Thierry Reding
2020-09-17 15:13 ` Dmitry Osipenko
2020-09-21 11:28 ` Thierry Reding
2020-09-21 10:20 ` Thierry Reding
2020-09-08 22:40 ` [PATCH v7 30/34] i2c: tegra: Clean up variable names Dmitry Osipenko
2020-09-17 12:21 ` Thierry Reding
2020-09-17 15:43 ` Dmitry Osipenko
2020-09-21 11:40 ` Thierry Reding
2020-09-21 15:18 ` Dmitry Osipenko
2020-09-21 15:50 ` Thierry Reding
2020-09-21 16:05 ` Dmitry Osipenko
2020-09-21 10:20 ` Thierry Reding
2020-09-08 22:40 ` [PATCH v7 31/34] i2c: tegra: Clean up printk messages Dmitry Osipenko
2020-09-17 12:22 ` Thierry Reding
2020-09-21 10:20 ` Thierry Reding
2020-09-08 22:40 ` [PATCH v7 32/34] i2c: tegra: Clean up and improve comments Dmitry Osipenko
2020-09-17 12:32 ` Thierry Reding
2020-09-17 15:02 ` Dmitry Osipenko
2020-09-17 15:17 ` Dmitry Osipenko
2020-09-21 11:43 ` Thierry Reding
2020-09-21 11:44 ` Thierry Reding
2020-09-21 10:20 ` Thierry Reding
2020-09-08 22:40 ` [PATCH v7 33/34] i2c: tegra: Clean up whitespaces, newlines and indentation Dmitry Osipenko
2020-09-17 12:35 ` Thierry Reding [this message]
2020-09-21 10:20 ` Thierry Reding
2020-09-08 22:40 ` [PATCH v7 34/34] i2c: tegra: Improve driver module description Dmitry Osipenko
2020-09-17 12:35 ` Thierry Reding
2020-09-21 10:20 ` Thierry Reding
2020-09-09 9:11 ` [PATCH v7 00/34] Improvements for Tegra I2C driver Andy Shevchenko
2020-09-09 15:36 ` Dmitry Osipenko
2020-09-09 15:49 ` Wolfram Sang
2020-09-09 17:39 ` Dmitry Osipenko
2020-09-17 12:44 ` Thierry Reding
2020-09-21 9:12 ` Wolfram Sang
2020-09-21 10:18 ` Thierry Reding
2020-09-21 10:42 ` Thierry Reding
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200917123544.GL3515672@ulmo \
--to=thierry.reding@gmail.com \
--cc=andy.shevchenko@gmail.com \
--cc=digetx@gmail.com \
--cc=jonathanh@nvidia.com \
--cc=ldewangan@nvidia.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=mirq-linux@rere.qmqm.pl \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).