From: Dmitry Osipenko <digetx@gmail.com>
To: "Thierry Reding" <thierry.reding@gmail.com>,
"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>
Cc: linux-i2c@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v3 15/22] i2c: tegra: Clean up whitespaces and newlines
Date: Thu, 3 Sep 2020 03:52:53 +0300 [thread overview]
Message-ID: <20200903005300.7894-16-digetx@gmail.com> (raw)
In-Reply-To: <20200903005300.7894-1-digetx@gmail.com>
Clean up couple places in the code by removing unnecessary and adding
necessary whitespaces / newlines.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/i2c/busses/i2c-tegra.c | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 7c5931639d42..ed8f2a7c2804 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -1223,9 +1223,11 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
xfer_size = msg->len + I2C_PACKET_HEADER_SIZE;
xfer_size = ALIGN(xfer_size, BYTES_PER_FIFO_WORD);
+
i2c_dev->is_curr_dma_xfer = (xfer_size > I2C_PIO_MODE_PREFERRED_LEN) &&
i2c_dev->dma_buf &&
!i2c_dev->is_curr_atomic_xfer;
+
tegra_i2c_config_fifo_trig(i2c_dev, xfer_size);
dma = i2c_dev->is_curr_dma_xfer;
/*
@@ -1233,16 +1235,18 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
* Total bits = 9 bits per byte (including ACK bit) + Start & stop bits
*/
xfer_time += DIV_ROUND_CLOSEST(((xfer_size * 9) + 2) * MSEC_PER_SEC,
- i2c_dev->bus_clk_rate);
+ i2c_dev->bus_clk_rate);
int_mask = I2C_INT_NO_ACK | I2C_INT_ARBITRATION_LOST;
tegra_i2c_unmask_irq(i2c_dev, int_mask);
+
if (dma) {
if (i2c_dev->msg_read) {
dma_sync_single_for_device(i2c_dev->dev,
i2c_dev->dma_phys,
xfer_size,
DMA_FROM_DEVICE);
+
err = tegra_i2c_dma_submit(i2c_dev, xfer_size);
if (err) {
dev_err(i2c_dev->dev,
@@ -1264,32 +1268,39 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
PACKET_HEADER0_PROTOCOL_I2C) |
FIELD_PREP(PACKET_HEADER0_CONT_ID, i2c_dev->cont_id) |
FIELD_PREP(PACKET_HEADER0_PACKET_ID, 1);
+
if (dma && !i2c_dev->msg_read)
*buffer++ = packet_header;
else
i2c_writel(i2c_dev, packet_header, I2C_TX_FIFO);
packet_header = msg->len - 1;
+
if (dma && !i2c_dev->msg_read)
*buffer++ = packet_header;
else
i2c_writel(i2c_dev, packet_header, I2C_TX_FIFO);
packet_header = I2C_HEADER_IE_ENABLE;
+
if (end_state == MSG_END_CONTINUE)
packet_header |= I2C_HEADER_CONTINUE_XFER;
else if (end_state == MSG_END_REPEAT_START)
packet_header |= I2C_HEADER_REPEAT_START;
+
if (msg->flags & I2C_M_TEN) {
packet_header |= msg->addr;
packet_header |= I2C_HEADER_10BIT_ADDR;
} else {
packet_header |= msg->addr << I2C_HEADER_SLAVE_ADDR_SHIFT;
}
+
if (msg->flags & I2C_M_IGNORE_NAK)
packet_header |= I2C_HEADER_CONT_ON_NAK;
+
if (msg->flags & I2C_M_RD)
packet_header |= I2C_HEADER_READ;
+
if (dma && !i2c_dev->msg_read)
*buffer++ = packet_header;
else
@@ -1298,10 +1309,12 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
if (!i2c_dev->msg_read) {
if (dma) {
memcpy(buffer, msg->buf, msg->len);
+
dma_sync_single_for_device(i2c_dev->dev,
i2c_dev->dma_phys,
xfer_size,
DMA_TO_DEVICE);
+
err = tegra_i2c_dma_submit(i2c_dev, xfer_size);
if (err) {
dev_err(i2c_dev->dev,
@@ -1315,6 +1328,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
if (i2c_dev->hw->has_per_pkt_xfer_complete_irq)
int_mask |= I2C_INT_PACKET_XFER_COMPLETE;
+
if (!dma) {
if (msg->flags & I2C_M_RD)
int_mask |= I2C_INT_RX_FIFO_DATA_REQ;
@@ -1355,8 +1369,8 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
i2c_dev->dma_phys,
xfer_size,
DMA_FROM_DEVICE);
- memcpy(i2c_dev->msg_buf, i2c_dev->dma_buf,
- msg->len);
+
+ memcpy(i2c_dev->msg_buf, i2c_dev->dma_buf, msg->len);
}
}
@@ -1969,15 +1983,14 @@ static const struct dev_pm_ops tegra_i2c_pm = {
};
static struct platform_driver tegra_i2c_driver = {
- .probe = tegra_i2c_probe,
- .remove = tegra_i2c_remove,
- .driver = {
- .name = "tegra-i2c",
+ .probe = tegra_i2c_probe,
+ .remove = tegra_i2c_remove,
+ .driver = {
+ .name = "tegra-i2c",
.of_match_table = tegra_i2c_of_match,
- .pm = &tegra_i2c_pm,
+ .pm = &tegra_i2c_pm,
},
};
-
module_platform_driver(tegra_i2c_driver);
MODULE_DESCRIPTION("nVidia Tegra2 I2C Bus Controller driver");
--
2.27.0
next prev parent reply other threads:[~2020-09-03 0:54 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 0:52 [PATCH v3 00/22] Improvements for Tegra I2C driver Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 01/22] i2c: tegra: Make tegra_i2c_flush_fifos() usable in atomic transfer Dmitry Osipenko
2020-09-03 11:02 ` Andy Shevchenko
2020-09-03 13:49 ` Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 02/22] i2c: tegra: Add missing newline before returns Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 03/22] i2c: tegra: Clean up messages in the code Dmitry Osipenko
2020-09-03 11:06 ` Andy Shevchenko
2020-09-03 13:44 ` Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 04/22] i2c: tegra: Don't ignore tegra_i2c_flush_fifos() error Dmitry Osipenko
2020-09-03 11:09 ` Andy Shevchenko
2020-09-03 13:54 ` Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 05/22] i2c: tegra: Use reset_control_reset() Dmitry Osipenko
2020-09-03 11:11 ` Andy Shevchenko
2020-09-03 13:47 ` Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 06/22] i2c: tegra: Improve formatting of function variables Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 07/22] i2c: tegra: Use dev_err_probe() Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 08/22] i2c: tegra: Runtime PM always available on Tegra Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 09/22] i2c: tegra: Clean up probe function Dmitry Osipenko
2020-09-03 11:17 ` Andy Shevchenko
2020-09-03 13:48 ` Dmitry Osipenko
2020-09-03 14:02 ` Andy Shevchenko
2020-09-03 15:56 ` Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 10/22] i2c: tegra: Drop '_timeout' from wait/poll function names Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 11/22] i2c: tegra: Remove likely/unlikely from the code Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 12/22] i2c: tegra: Factor out error recovery from tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 13/22] i2c: tegra: Check errors for both positive and negative values Dmitry Osipenko
2020-09-03 11:19 ` Andy Shevchenko
2020-09-03 0:52 ` [PATCH v3 14/22] i2c: tegra: Improve coding style of tegra_i2c_wait_for_config_load() Dmitry Osipenko
2020-09-03 0:52 ` Dmitry Osipenko [this message]
2020-09-03 0:52 ` [PATCH v3 16/22] i2c: tegra: Rename variable in tegra_i2c_issue_bus_clear() Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 17/22] i2c: tegra: Improve driver module description Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 18/22] i2c: tegra: Reorder location of functions in the code Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 19/22] i2c: tegra: Factor out packet header setup from tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 20/22] i2c: tegra: Remove "dma" variable Dmitry Osipenko
2020-09-03 0:52 ` [PATCH v3 21/22] i2c: tegra: Initialization div-clk rate unconditionally Dmitry Osipenko
2020-09-03 0:53 ` [PATCH v3 22/22] i2c: tegra: Remove i2c_dev.clk_divisor_non_hs_mode member Dmitry Osipenko
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=20200903005300.7894-16-digetx@gmail.com \
--to=digetx@gmail.com \
--cc=andy.shevchenko@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=thierry.reding@gmail.com \
--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