]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
i2c: stm32f7: cosmetic: clean the driver
authorPatrick Delaunay <patrick.delaunay@st.com>
Mon, 29 Oct 2018 14:31:55 +0000 (15:31 +0100)
committerTom Rini <trini@konsulko.com>
Fri, 16 Nov 2018 21:51:58 +0000 (16:51 -0500)
Solve alignments issues in the driver to avoid
checkpatch error.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
drivers/i2c/stm32f7_i2c.c

index 36ec610c8ec696cdf01e2daf9ecf9afcacef6c3f..7ed04d9bfcc062ca00e23a90f758379bdeb1d779 100644 (file)
@@ -58,7 +58,7 @@ struct stm32_i2c_regs {
 #define STM32_I2C_CR2_ADD10                    BIT(11)
 #define STM32_I2C_CR2_RD_WRN                   BIT(10)
 #define STM32_I2C_CR2_SADD10_MASK              GENMASK(9, 0)
-#define STM32_I2C_CR2_SADD10(n)                        ((n & STM32_I2C_CR2_SADD10_MASK))
+#define STM32_I2C_CR2_SADD10(n)                        (n & STM32_I2C_CR2_SADD10_MASK)
 #define STM32_I2C_CR2_SADD7_MASK               GENMASK(7, 1)
 #define STM32_I2C_CR2_SADD7(n)                 ((n & 0x7f) << 1)
 #define STM32_I2C_CR2_RESET_MASK               (STM32_I2C_CR2_HEAD10R \
@@ -255,7 +255,7 @@ static int stm32_i2c_check_device_busy(struct stm32_i2c_priv *i2c_priv)
 }
 
 static void stm32_i2c_message_start(struct stm32_i2c_priv *i2c_priv,
-                                     struct i2c_msg *msg, bool stop)
+                                   struct i2c_msg *msg, bool stop)
 {
        struct stm32_i2c_regs *regs = i2c_priv->regs;
        u32 cr2 = readl(&regs->cr2);
@@ -299,7 +299,7 @@ static void stm32_i2c_message_start(struct stm32_i2c_priv *i2c_priv,
  */
 
 static void stm32_i2c_handle_reload(struct stm32_i2c_priv *i2c_priv,
-                                     struct i2c_msg *msg, bool stop)
+                                   struct i2c_msg *msg, bool stop)
 {
        struct stm32_i2c_regs *regs = i2c_priv->regs;
        u32 cr2 = readl(&regs->cr2);
@@ -317,7 +317,7 @@ static void stm32_i2c_handle_reload(struct stm32_i2c_priv *i2c_priv,
 }
 
 static int stm32_i2c_wait_flags(struct stm32_i2c_priv *i2c_priv,
-                                 u32 flags, u32 *status)
+                               u32 flags, u32 *status)
 {
        struct stm32_i2c_regs *regs = i2c_priv->regs;
        u32 time_start = get_timer(0);
@@ -392,7 +392,7 @@ static int stm32_i2c_check_end_of_message(struct stm32_i2c_priv *i2c_priv)
 }
 
 static int stm32_i2c_message_xfer(struct stm32_i2c_priv *i2c_priv,
-                                   struct i2c_msg *msg, bool stop)
+                                 struct i2c_msg *msg, bool stop)
 {
        struct stm32_i2c_regs *regs = i2c_priv->regs;
        u32 status;
@@ -465,7 +465,7 @@ static int stm32_i2c_message_xfer(struct stm32_i2c_priv *i2c_priv,
 }
 
 static int stm32_i2c_xfer(struct udevice *bus, struct i2c_msg *msg,
-                           int nmsgs)
+                         int nmsgs)
 {
        struct stm32_i2c_priv *i2c_priv = dev_get_priv(bus);
        int ret;
@@ -594,6 +594,7 @@ static int stm32_i2c_choose_solution(struct stm32_i2c_setup *setup,
 
                for (l = 0; l < STM32_SCLL_MAX; l++) {
                        u32 tscl_l = (l + 1) * prescaler + tsync;
+
                        if ((tscl_l < i2c_specs[setup->speed].l_min) ||
                            (i2cclk >=
                             ((tscl_l - af_delay_min - dnf_delay) / 4))) {
@@ -634,8 +635,8 @@ static int stm32_i2c_choose_solution(struct stm32_i2c_setup *setup,
 }
 
 static int stm32_i2c_compute_timing(struct stm32_i2c_priv *i2c_priv,
-                                     struct stm32_i2c_setup *setup,
-                                     struct stm32_i2c_timings *output)
+                                   struct stm32_i2c_setup *setup,
+                                   struct stm32_i2c_timings *output)
 {
        struct stm32_i2c_timings *v, *_v;
        struct list_head solutions;
@@ -643,28 +644,28 @@ static int stm32_i2c_compute_timing(struct stm32_i2c_priv *i2c_priv,
 
        if (setup->speed >= STM32_I2C_SPEED_END) {
                pr_err("%s: speed out of bound {%d/%d}\n", __func__,
-                     setup->speed, STM32_I2C_SPEED_END - 1);
+                      setup->speed, STM32_I2C_SPEED_END - 1);
                return -EINVAL;
        }
 
        if ((setup->rise_time > i2c_specs[setup->speed].rise_max) ||
            (setup->fall_time > i2c_specs[setup->speed].fall_max)) {
                pr_err("%s :timings out of bound Rise{%d>%d}/Fall{%d>%d}\n",
-                     __func__,
-                     setup->rise_time, i2c_specs[setup->speed].rise_max,
-                     setup->fall_time, i2c_specs[setup->speed].fall_max);
+                      __func__,
+                      setup->rise_time, i2c_specs[setup->speed].rise_max,
+                      setup->fall_time, i2c_specs[setup->speed].fall_max);
                return -EINVAL;
        }
 
        if (setup->dnf > STM32_I2C_DNF_MAX) {
                pr_err("%s: DNF out of bound %d/%d\n", __func__,
-                     setup->dnf, STM32_I2C_DNF_MAX);
+                      setup->dnf, STM32_I2C_DNF_MAX);
                return -EINVAL;
        }
 
        if (setup->speed_freq > i2c_specs[setup->speed].rate) {
                pr_err("%s: Freq {%d/%d}\n", __func__,
-                     setup->speed_freq, i2c_specs[setup->speed].rate);
+                      setup->speed_freq, i2c_specs[setup->speed].rate);
                return -EINVAL;
        }
 
@@ -693,7 +694,7 @@ exit:
 }
 
 static int stm32_i2c_setup_timing(struct stm32_i2c_priv *i2c_priv,
-                                   struct stm32_i2c_timings *timing)
+                                 struct stm32_i2c_timings *timing)
 {
        struct stm32_i2c_setup *setup = i2c_priv->setup;
        int ret = 0;