lkml.org 
[lkml]   [2020]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 17/31] i2c: tegra: Improve formatting of function variables
    Date
    Reorder the definition of variables in the code 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 | 44 ++++++++++++++--------------------
    1 file changed, 18 insertions(+), 26 deletions(-)

    diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
    index f52046593b8b..a2ae4dab8001 100644
    --- a/drivers/i2c/busses/i2c-tegra.c
    +++ b/drivers/i2c/busses/i2c-tegra.c
    @@ -412,8 +412,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 +505,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 +566,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);
    @@ -755,12 +755,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);
    @@ -873,9 +869,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);

    @@ -979,12 +975,11 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)
    static void 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};
    + unsigned long reg_offset;
    + u32 val, reg, dma_burst;
    struct dma_chan *chan;
    int ret;
    - unsigned long reg_offset;

    if (i2c_dev->hw->has_mst_fifo)
    reg = I2C_MST_FIFO_CONTROL;
    @@ -1110,9 +1105,9 @@ 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);
    - int err;
    unsigned long time_left;
    u32 reg;
    + int err;

    reinit_completion(&i2c_dev->msg_complete);
    reg = FIELD_PREP(I2C_BC_SCLK_THRESHOLD, 9) | I2C_BC_STOP_COND |
    @@ -1149,13 +1144,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)
    @@ -1351,8 +1344,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) {
    @@ -1406,8 +1398,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
    \
     
     \ /
      Last update: 2020-09-05 22:47    [W:4.169 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site