07.06.2019 14:55, Bitan Biswas пишет:
> Fix checkpatch.pl alignment and blank line check(s) in i2c-tegra.c
>
> Signed-off-by: Bitan Biswas <bbiswas@xxxxxxxxxx>
> ---
> drivers/i2c/busses/i2c-tegra.c | 35 +++++++++++++++++++----------------
> 1 file changed, 19 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
> index f7116b7..2d381de 100644
> --- a/drivers/i2c/busses/i2c-tegra.c
> +++ b/drivers/i2c/busses/i2c-tegra.c
> @@ -295,7 +295,7 @@ static u32 dvc_readl(struct tegra_i2c_dev *i2c_dev, unsigned long reg)
> * to the I2C block inside the DVC block
> */
> static unsigned long tegra_i2c_reg_addr(struct tegra_i2c_dev *i2c_dev,
> - unsigned long reg)
> + unsigned long reg)
> {
> if (i2c_dev->is_dvc)
> reg += (reg >= I2C_TX_FIFO) ? 0x10 : 0x40;
> @@ -303,7 +303,7 @@ static unsigned long tegra_i2c_reg_addr(struct tegra_i2c_dev *i2c_dev,
> }
>
> static void i2c_writel(struct tegra_i2c_dev *i2c_dev, u32 val,
> - unsigned long reg)
> + unsigned long reg)
> {
> writel(val, i2c_dev->base + tegra_i2c_reg_addr(i2c_dev, reg));
>
> @@ -318,13 +318,13 @@ static u32 i2c_readl(struct tegra_i2c_dev *i2c_dev, unsigned long reg)
> }
>
> static void i2c_writesl(struct tegra_i2c_dev *i2c_dev, void *data,
> - unsigned long reg, int len)
> + unsigned long 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)
> + unsigned long reg, int len)
> {
> readsl(i2c_dev->base + tegra_i2c_reg_addr(i2c_dev, reg), data, len);
> }
> @@ -669,10 +669,11 @@ static int tegra_i2c_wait_for_config_load(struct tegra_i2c_dev *i2c_dev)
> i2c_writel(i2c_dev, I2C_MSTR_CONFIG_LOAD, I2C_CONFIG_LOAD);
> if (in_interrupt())
> err = readl_poll_timeout_atomic(addr, val, val == 0,
> - 1000, I2C_CONFIG_LOAD_TIMEOUT);
> + 1000,
> + I2C_CONFIG_LOAD_TIMEOUT);
> else
> - err = readl_poll_timeout(addr, val, val == 0,
> - 1000, I2C_CONFIG_LOAD_TIMEOUT);
> + err = readl_poll_timeout(addr, val, val == 0, 1000,
> + I2C_CONFIG_LOAD_TIMEOUT);
>
> if (err) {
> dev_warn(i2c_dev->dev,
> @@ -1013,7 +1014,8 @@ static int tegra_i2c_issue_bus_clear(struct i2c_adapter *adap)
> }
>
> static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
> - struct i2c_msg *msg, enum msg_end_type end_state)
> + struct i2c_msg *msg,
> + enum msg_end_type end_state)
> {
> u32 packet_header;
> u32 int_mask;
> @@ -1150,9 +1152,8 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
> if (err)
> return err;
>
> - time_left = wait_for_completion_timeout(
> - &i2c_dev->dma_complete,
> - msecs_to_jiffies(xfer_time));
> + time_left = wait_for_completion_timeout(&i2c_dev->dma_complete,
> + msecs_to_jiffies(xfer_time));
> if (time_left == 0) {
> dev_err(i2c_dev->dev, "DMA transfer timeout\n");
> dmaengine_terminate_sync(i2c_dev->msg_read ?
> @@ -1214,7 +1215,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
> }
>
> static int tegra_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[],
> - int num)
> + int num)
> {
> struct tegra_i2c_dev *i2c_dev = i2c_get_adapdata(adap);
> int i;
> @@ -1260,14 +1261,15 @@ 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;
>
> ret = of_property_read_u32(np, "clock-frequency",
> - &i2c_dev->bus_clk_rate);
> + &i2c_dev->bus_clk_rate);
> if (ret)
> i2c_dev->bus_clk_rate = 100000; /* default clock rate */
>
> - i2c_dev->is_multimaster_mode = of_property_read_bool(np,
> - "multi-master");
> + multi_mode = of_property_read_bool(np, "multi-master");
> + i2c_dev->is_multimaster_mode = multi_mode;
> }
>
> static const struct i2c_algorithm tegra_i2c_algo = {
> @@ -1611,7 +1613,7 @@ static int tegra_i2c_probe(struct platform_device *pdev)
> }
>
> ret = devm_request_irq(&pdev->dev, i2c_dev->irq,
> - tegra_i2c_isr, 0, dev_name(&pdev->dev), i2c_dev);
> + tegra_i2c_isr, 0, dev_name(&pdev->dev), i2c_dev);
> if (ret) {
> dev_err(&pdev->dev, "Failed to request irq %i\n", i2c_dev->irq);
> goto release_dma;
> @@ -1704,6 +1706,7 @@ static const struct dev_pm_ops tegra_i2c_pm = {
> SET_RUNTIME_PM_OPS(tegra_i2c_runtime_suspend, tegra_i2c_runtime_resume,
> NULL)
> };
> +
> #define TEGRA_I2C_PM (&tegra_i2c_pm)
> #else
> #define TEGRA_I2C_PM NULL
>
Very nice!
Reviewed-by: Dmitry Osipenko <digetx@xxxxxxxxx>
