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 v5 19/36] i2c: tegra: Improve formatting of function variables
Date: Sun, 6 Sep 2020 21:50:22 +0300 [thread overview]
Message-ID: <20200906185039.22700-20-digetx@gmail.com> (raw)
In-Reply-To: <20200906185039.22700-1-digetx@gmail.com>
Reorder definition of variables in the code to have them sorted by length
in order to make code easier to read.
Reviewed-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/i2c/busses/i2c-tegra.c | 61 +++++++++++++---------------------
1 file changed, 24 insertions(+), 37 deletions(-)
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index f38e0f3fe367..5ecc9f7c9b78 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -290,13 +290,12 @@ struct tegra_i2c_dev {
static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev);
-static void dvc_writel(struct tegra_i2c_dev *i2c_dev, u32 val,
- unsigned long reg)
+static void dvc_writel(struct tegra_i2c_dev *i2c_dev, u32 val, u32 reg)
{
writel_relaxed(val, i2c_dev->base + reg);
}
-static u32 dvc_readl(struct tegra_i2c_dev *i2c_dev, unsigned long reg)
+static u32 dvc_readl(struct tegra_i2c_dev *i2c_dev, u32 reg)
{
return readl_relaxed(i2c_dev->base + reg);
}
@@ -305,8 +304,7 @@ static u32 dvc_readl(struct tegra_i2c_dev *i2c_dev, unsigned long reg)
* i2c_writel and i2c_readl will offset the register if necessary to talk
* to the I2C block inside the DVC block
*/
-static unsigned long tegra_i2c_reg_addr(struct tegra_i2c_dev *i2c_dev,
- unsigned long reg)
+static u32 tegra_i2c_reg_addr(struct tegra_i2c_dev *i2c_dev, u32 reg)
{
if (i2c_dev->is_dvc)
reg += (reg >= I2C_TX_FIFO) ? 0x10 : 0x40;
@@ -315,8 +313,7 @@ static unsigned long tegra_i2c_reg_addr(struct tegra_i2c_dev *i2c_dev,
return reg;
}
-static void i2c_writel(struct tegra_i2c_dev *i2c_dev, u32 val,
- unsigned long reg)
+static void i2c_writel(struct tegra_i2c_dev *i2c_dev, u32 val, u32 reg)
{
writel_relaxed(val, i2c_dev->base + tegra_i2c_reg_addr(i2c_dev, reg));
@@ -325,19 +322,19 @@ static void i2c_writel(struct tegra_i2c_dev *i2c_dev, u32 val,
readl_relaxed(i2c_dev->base + tegra_i2c_reg_addr(i2c_dev, reg));
}
-static u32 i2c_readl(struct tegra_i2c_dev *i2c_dev, unsigned long reg)
+static u32 i2c_readl(struct tegra_i2c_dev *i2c_dev, u32 reg)
{
return readl_relaxed(i2c_dev->base + tegra_i2c_reg_addr(i2c_dev, reg));
}
static void i2c_writesl(struct tegra_i2c_dev *i2c_dev, void *data,
- unsigned long reg, int len)
+ u32 reg, int len)
{
writesl(i2c_dev->base + tegra_i2c_reg_addr(i2c_dev, reg), data, len);
}
static void i2c_readsl(struct tegra_i2c_dev *i2c_dev, void *data,
- unsigned long reg, int len)
+ u32 reg, int len)
{
readsl(i2c_dev->base + tegra_i2c_reg_addr(i2c_dev, reg), data, len);
}
@@ -412,8 +409,8 @@ static void tegra_i2c_release_dma(struct tegra_i2c_dev *i2c_dev)
static int tegra_i2c_init_dma(struct tegra_i2c_dev *i2c_dev)
{
struct dma_chan *chan;
- u32 *dma_buf;
dma_addr_t dma_phys;
+ u32 *dma_buf;
int err;
if (!i2c_dev->hw->has_apb_dma || i2c_dev->is_vi)
@@ -505,11 +502,11 @@ static int tegra_i2c_flush_fifos(struct tegra_i2c_dev *i2c_dev)
static int tegra_i2c_empty_rx_fifo(struct tegra_i2c_dev *i2c_dev)
{
- u32 val;
- int rx_fifo_avail;
- u8 *buf = i2c_dev->msg_buf;
size_t buf_remaining = i2c_dev->msg_buf_remaining;
+ u8 *buf = i2c_dev->msg_buf;
int words_to_transfer;
+ int rx_fifo_avail;
+ u32 val;
/*
* Catch overflow due to message fully sent
@@ -566,11 +563,11 @@ static int tegra_i2c_empty_rx_fifo(struct tegra_i2c_dev *i2c_dev)
static int tegra_i2c_fill_tx_fifo(struct tegra_i2c_dev *i2c_dev)
{
- u32 val;
- int tx_fifo_avail;
- u8 *buf = i2c_dev->msg_buf;
size_t buf_remaining = i2c_dev->msg_buf_remaining;
+ u8 *buf = i2c_dev->msg_buf;
int words_to_transfer;
+ int tx_fifo_avail;
+ u32 val;
if (i2c_dev->hw->has_mst_fifo) {
val = i2c_readl(i2c_dev, I2C_MST_FIFO_STATUS);
@@ -754,12 +751,8 @@ static void tegra_i2c_vi_init(struct tegra_i2c_dev *i2c_dev)
static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
{
- u32 val;
+ u32 val, clk_divisor, clk_multiplier, tsu_thd, tlow, thigh, non_hs_mode;
int err;
- u32 clk_divisor, clk_multiplier;
- u32 non_hs_mode;
- u32 tsu_thd;
- u8 tlow, thigh;
err = reset_control_reset(i2c_dev->rst);
WARN_ON_ONCE(err);
@@ -872,9 +865,9 @@ static int tegra_i2c_disable_packet_mode(struct tegra_i2c_dev *i2c_dev)
static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)
{
- u32 status;
const u32 status_err = I2C_INT_NO_ACK | I2C_INT_ARBITRATION_LOST;
struct tegra_i2c_dev *i2c_dev = dev_id;
+ u32 status;
status = i2c_readl(i2c_dev, I2C_INT_STATUS);
@@ -977,12 +970,10 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)
static int tegra_i2c_config_fifo_trig(struct tegra_i2c_dev *i2c_dev, size_t len)
{
- u32 val, reg;
- u8 dma_burst;
struct dma_slave_config slv_config = {0};
+ u32 val, reg, dma_burst, reg_offset;
struct dma_chan *chan;
int ret;
- unsigned long reg_offset;
if (i2c_dev->hw->has_mst_fifo)
reg = I2C_MST_FIFO_CONTROL;
@@ -1108,9 +1099,8 @@ tegra_i2c_wait_completion_timeout(struct tegra_i2c_dev *i2c_dev,
static int tegra_i2c_issue_bus_clear(struct i2c_adapter *adap)
{
struct tegra_i2c_dev *i2c_dev = i2c_get_adapdata(adap);
+ u32 reg, time_left;
int err;
- unsigned long time_left;
- u32 reg;
reinit_completion(&i2c_dev->msg_complete);
reg = FIELD_PREP(I2C_BC_SCLK_THRESHOLD, 9) | I2C_BC_STOP_COND |
@@ -1148,13 +1138,11 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
struct i2c_msg *msg,
enum msg_end_type end_state)
{
- u32 packet_header;
- u32 int_mask;
- unsigned long time_left;
- size_t xfer_size;
+ unsigned long time_left, xfer_time = 100;
+ u32 packet_header, int_mask;
u32 *buffer = NULL;
- int err = 0;
- u16 xfer_time = 100;
+ size_t xfer_size;
+ int err;
err = tegra_i2c_flush_fifos(i2c_dev);
if (err)
@@ -1353,8 +1341,7 @@ static int tegra_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[],
int num)
{
struct tegra_i2c_dev *i2c_dev = i2c_get_adapdata(adap);
- int i;
- int ret;
+ int i, ret;
ret = pm_runtime_get_sync(i2c_dev->dev);
if (ret < 0) {
@@ -1408,8 +1395,8 @@ static u32 tegra_i2c_func(struct i2c_adapter *adap)
static void tegra_i2c_parse_dt(struct tegra_i2c_dev *i2c_dev)
{
struct device_node *np = i2c_dev->dev->of_node;
- int ret;
bool multi_mode;
+ int ret;
ret = of_property_read_u32(np, "clock-frequency",
&i2c_dev->bus_clk_rate);
--
2.27.0
next prev parent reply other threads:[~2020-09-06 18:54 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-06 18:50 [PATCH v5 00/36] Improvements for Tegra I2C driver Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 01/36] i2c: tegra: Make tegra_i2c_flush_fifos() usable in atomic transfer Dmitry Osipenko
2020-09-07 7:56 ` Andy Shevchenko
2020-09-07 14:31 ` Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 02/36] i2c: tegra: Handle potential error of tegra_i2c_flush_fifos() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 03/36] i2c: tegra: Mask interrupt in tegra_i2c_issue_bus_clear() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 04/36] i2c: tegra: Initialization div-clk rate unconditionally Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 05/36] i2c: tegra: Remove i2c_dev.clk_divisor_non_hs_mode member Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 06/36] i2c: tegra: Runtime PM always available on Tegra Dmitry Osipenko
2020-09-07 8:10 ` Andy Shevchenko
2020-09-07 14:31 ` Dmitry Osipenko
2020-09-07 15:05 ` Andy Shevchenko
2020-09-07 15:25 ` Dmitry Osipenko
2020-09-07 15:34 ` Andy Shevchenko
2020-09-07 16:06 ` Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 07/36] i2c: tegra: Remove error message used for devm_request_irq() failure Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 08/36] i2c: tegra: Use reset_control_reset() Dmitry Osipenko
2020-09-07 8:13 ` Andy Shevchenko
2020-09-07 14:33 ` Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 09/36] i2c: tegra: Use devm_platform_get_and_ioremap_resource() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 10/36] i2c: tegra: Use platform_get_irq() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 11/36] i2c: tegra: Use clk-bulk helpers Dmitry Osipenko
2020-09-07 8:21 ` Andy Shevchenko
2020-09-07 14:33 ` Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 12/36] i2c: tegra: Move out all device-tree parsing into tegra_i2c_parse_dt() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 13/36] i2c: tegra: Clean up probe function Dmitry Osipenko
2020-09-07 8:20 ` Andy Shevchenko
2020-09-07 14:33 ` Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 14/36] i2c: tegra: Remove likely/unlikely from the code Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 15/36] i2c: tegra: Remove outdated barrier() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 16/36] i2c: tegra: Remove "dma" variable from tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 17/36] i2c: tegra: Remove redundant check in tegra_i2c_issue_bus_clear() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 18/36] i2c: tegra: Don't fall back to PIO mode if DMA configuration fails Dmitry Osipenko
2020-09-06 18:50 ` Dmitry Osipenko [this message]
2020-09-06 18:50 ` [PATCH v5 20/36] i2c: tegra: Improve coding style of tegra_i2c_wait_for_config_load() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 21/36] i2c: tegra: Rename wait/poll functions Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 22/36] i2c: tegra: Rename variable in tegra_i2c_issue_bus_clear() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 23/36] i2c: tegra: Factor out error recovery from tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 24/36] i2c: tegra: Factor out packet header setup " Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 25/36] i2c: tegra: Factor out register polling into separate function Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 26/36] i2c: tegra: Factor out hardware initialization " Dmitry Osipenko
2020-09-07 8:25 ` Andy Shevchenko
2020-09-06 18:50 ` [PATCH v5 27/36] i2c: tegra: Reorder location of functions in the code Dmitry Osipenko
2020-09-07 8:27 ` Andy Shevchenko
2020-09-07 14:36 ` Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 28/36] i2c: tegra: Check errors for both positive and negative values Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 29/36] i2c: tegra: Consolidate error handling in tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 30/36] i2c: tegra: Clean up printk messages Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 31/36] i2c: tegra: Clean up whitespaces, newlines and indentation Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 32/36] i2c: tegra: Clean up and improve comments Dmitry Osipenko
2020-09-07 8:29 ` Andy Shevchenko
2020-09-06 18:50 ` [PATCH v5 33/36] i2c: tegra: Clean up variable types Dmitry Osipenko
2020-09-07 8:30 ` Andy Shevchenko
2020-09-06 18:50 ` [PATCH v5 34/36] i2c: tegra: Improve driver module description Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 35/36] i2c: tegra: Rename couple "ret" variables to "err" Dmitry Osipenko
2020-09-07 8:31 ` Andy Shevchenko
2020-09-06 18:50 ` [PATCH v5 36/36] i2c: tegra: Improve tegra_i2c_dev structure Dmitry Osipenko
2020-09-07 8:32 ` Andy Shevchenko
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=20200906185039.22700-20-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