Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 17 Sep 2020 14:35:44 +0200
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>,
        =?utf-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= <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
Message-ID: <20200917123544.GL3515672@ulmo>
References: <20200908224006.25636-1-digetx@gmail.com>
 <20200908224006.25636-34-digetx@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="tKh+x8PS77aidDsl"
Content-Disposition: inline
In-Reply-To: <20200908224006.25636-34-digetx@gmail.com>
User-Agent: Mutt/1.14.6 (2020-07-11)
Precedence: bulk


--tKh+x8PS77aidDsl
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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.
>=20
> Reviewed-by: Micha=C5=82 Miros=C5=82aw <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(-)
>=20
> diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegr=
a.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 *i=
2c_dev, u32 reg)
>  		reg +=3D (reg >=3D I2C_TX_FIFO) ? 0x10 : 0x40;
>  	else if (i2c_dev->is_vi)
>  		reg =3D 0xc00 + (reg << 2);
> +
>  	return reg;
>  }
> =20
> @@ -373,9 +374,12 @@ static int tegra_i2c_dma_submit(struct tegra_i2c_dev=
 *i2c_dev, size_t len)
>  	struct dma_chan *chan;
> =20
>  	dev_dbg(i2c_dev->dev, "starting DMA for length: %zu\n", len);
> +
>  	reinit_completion(&i2c_dev->dma_complete);
> +
>  	dir =3D i2c_dev->msg_read ? DMA_DEV_TO_MEM : DMA_MEM_TO_DEV;
>  	chan =3D i2c_dev->msg_read ? i2c_dev->rx_dma_chan : i2c_dev->tx_dma_cha=
n;
> +
>  	dma_desc =3D 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)
> =20
>  	dma_desc->callback =3D tegra_i2c_dma_complete;
>  	dma_desc->callback_param =3D i2c_dev;
> +
>  	dmaengine_submit(dma_desc);
>  	dma_async_issue_pending(chan);
> +
>  	return 0;
>  }
> =20
> @@ -455,6 +461,7 @@ static int tegra_i2c_init_dma(struct tegra_i2c_dev *i=
2c_dev)
> =20
>  	i2c_dev->dma_buf =3D dma_buf;
>  	i2c_dev->dma_phys =3D dma_phys;
> +
>  	return 0;
> =20
>  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;
>  }
> =20
> @@ -650,8 +658,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_d=
ev)
>  	if (i2c_dev->hw->has_interface_timing_reg && tsu_thd)
>  		i2c_writel(i2c_dev, tsu_thd, I2C_INTERFACE_TIMING_1);
> =20
> -	clk_multiplier  =3D tlow + thigh + 2;
> -	clk_multiplier *=3D non_hs_mode + 1;
> +	clk_multiplier =3D (tlow + thigh + 2) * (non_hs_mode + 1);
> =20
>  	err =3D 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_de=
v *i2c_dev)
>  		 */
>  		buf_remaining -=3D words_to_transfer * BYTES_PER_FIFO_WORD;
>  		tx_fifo_avail -=3D words_to_transfer;
> +
>  		i2c_dev->msg_buf_remaining =3D buf_remaining;
> -		i2c_dev->msg_buf =3D buf +
> -			words_to_transfer * BYTES_PER_FIFO_WORD;
> +		i2c_dev->msg_buf =3D buf + words_to_transfer * BYTES_PER_FIFO_WORD;
> =20
>  		i2c_writesl(i2c_dev, buf, I2C_TX_FIFO, words_to_transfer);
> =20
> @@ -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>

--tKh+x8PS77aidDsl
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAl9jWCAACgkQ3SOs138+
s6GCVA//W79A190+2W0uOxIWxiaJNbyANhmZG2Rr+NCnOzkfux/K9moch6/uLB/P
THZASmuNRenBWhZ+/e8lRkZhXwpeUVSD8y8VxLGnVhxaOhKo0C1RdyY6l6gglLbD
mF0B+glwz2NHyXdZhtGcAGswu/cW0glRzqtehiEqb9J98N9dgroiafzmYr/zc2Ip
q4Zp0kAM/l+AIEFfUMmrTZ8nfX2vd5+rz8kYHwsKYjvL85yCAad4XV1vzrK47P6T
Iwy4auCx6Rr2+Fh8TImMTU9LcfEOltTHT8/4jl4PLcV5QxA6qvriW1pymUqlyJLG
EYxo4ezVN+Sf8CexT4rPM90AHtNKH5ToLHtcvgV6vT73OBqtSEA6/t48heGIQF24
/i5Lo2kVgtmuYugd7F55Ws/xfGWZi31wHvE9c1NAvpU3FeaYFFoZydRALtcLNDRQ
AOOpvdhjvbVJC6n7I2xJcJcUCPJhYVLdRUBKbdJlWYCgZSG5u4hVB/x41SLdI6rq
sb1xRI23wBwx09WVmT0vBVFxx57Pz0AZsyfBt4ZVTwzt1rdY0OW/hvKpPSor2T7m
Ow+VRunI7I3MBMOdtocY2H2948AqA6+iag9CEGeKgQo2iIiMGVslmojLX2fLD++i
RtakINWoV7rxPjsWqVXt73OKRzMpDFoUtWHj9aWg/b9U2L899e8=
=yIYF
-----END PGP SIGNATURE-----

--tKh+x8PS77aidDsl--