[v2,5/8] i2c: designware: Call i2c_dw_clk_rate() only once in i2c_dw_init_master()

Message ID 20180601134725.1375-6-jarkko.nikula@linux.intel.com
State Superseded
Headers show
Series
  • i2c: designware: Improve debug prints
Related show

Commit Message

Jarkko Nikula June 1, 2018, 1:47 p.m.
This is rather readability update than micro-optimization, or if not
optimization at all. We take the input clock rate to a variable and pass
that to SCL timing parameter calculation functions.

While at it, indent i2c_dw_scl_hcnt()/i2c_dw_scl_lcnt() argument list to
the same alignment. Now first argument is off by one character.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
 drivers/i2c/busses/i2c-designware-master.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Comments

Andy Shevchenko June 4, 2018, 12:44 p.m. | #1
On Fri, 2018-06-01 at 16:47 +0300, Jarkko Nikula wrote:
> This is rather readability update than micro-optimization, or if not
> optimization at all. We take the input clock rate to a variable and
> pass
> that to SCL timing parameter calculation functions.
> 
> While at it, indent i2c_dw_scl_hcnt()/i2c_dw_scl_lcnt() argument list
> to
> the same alignment. Now first argument is off by one character.
> 

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

I think it worth to add that this indentation done in that way is to
make the further changes cleaner.

> Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
> ---
>  drivers/i2c/busses/i2c-designware-master.c | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-designware-master.c
> b/drivers/i2c/busses/i2c-designware-master.c
> index b89bc8a5b0b1..6557e163065e 100644
> --- a/drivers/i2c/busses/i2c-designware-master.c
> +++ b/drivers/i2c/busses/i2c-designware-master.c
> @@ -60,6 +60,7 @@ static void i2c_dw_set_timings_master(struct
> dw_i2c_dev *dev)
>   */
>  static int i2c_dw_init_master(struct dw_i2c_dev *dev)
>  {
> +	u32 ic_clk = i2c_dw_clk_rate(dev);
>  	u32 hcnt, lcnt;
>  	u32 comp_param1;
>  	u32 sda_falling_time, scl_falling_time;
> @@ -84,12 +85,14 @@ static int i2c_dw_init_master(struct dw_i2c_dev
> *dev)
>  		hcnt = dev->ss_hcnt;
>  		lcnt = dev->ss_lcnt;
>  	} else {
> -		hcnt = i2c_dw_scl_hcnt(i2c_dw_clk_rate(dev),
> +		hcnt =
> +			i2c_dw_scl_hcnt(ic_clk,
>  					4000,	/* tHD;STA =
> tHIGH = 4.0 us */
>  					sda_falling_time,
>  					0,	/* 0: DW default,
> 1: Ideal */
>  					0);	/* No offset */
> -		lcnt = i2c_dw_scl_lcnt(i2c_dw_clk_rate(dev),
> +		lcnt =
> +			i2c_dw_scl_lcnt(ic_clk,
>  					4700,	/* tLOW = 4.7 us
> */
>  					scl_falling_time,
>  					0);	/* No offset */
> @@ -106,12 +109,14 @@ static int i2c_dw_init_master(struct dw_i2c_dev
> *dev)
>  		hcnt = dev->fs_hcnt;
>  		lcnt = dev->fs_lcnt;
>  	} else {
> -		hcnt = i2c_dw_scl_hcnt(i2c_dw_clk_rate(dev),
> +		hcnt =
> +			i2c_dw_scl_hcnt(ic_clk,
>  					600,	/* tHD;STA =
> tHIGH = 0.6 us */
>  					sda_falling_time,
>  					0,	/* 0: DW default,
> 1: Ideal */
>  					0);	/* No offset */
> -		lcnt = i2c_dw_scl_lcnt(i2c_dw_clk_rate(dev),
> +		lcnt =
> +			i2c_dw_scl_lcnt(ic_clk,
>  					1300,	/* tLOW = 1.3 us
> */
>  					scl_falling_time,
>  					0);	/* No offset */

Patch

diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c
index b89bc8a5b0b1..6557e163065e 100644
--- a/drivers/i2c/busses/i2c-designware-master.c
+++ b/drivers/i2c/busses/i2c-designware-master.c
@@ -60,6 +60,7 @@  static void i2c_dw_set_timings_master(struct dw_i2c_dev *dev)
  */
 static int i2c_dw_init_master(struct dw_i2c_dev *dev)
 {
+	u32 ic_clk = i2c_dw_clk_rate(dev);
 	u32 hcnt, lcnt;
 	u32 comp_param1;
 	u32 sda_falling_time, scl_falling_time;
@@ -84,12 +85,14 @@  static int i2c_dw_init_master(struct dw_i2c_dev *dev)
 		hcnt = dev->ss_hcnt;
 		lcnt = dev->ss_lcnt;
 	} else {
-		hcnt = i2c_dw_scl_hcnt(i2c_dw_clk_rate(dev),
+		hcnt =
+			i2c_dw_scl_hcnt(ic_clk,
 					4000,	/* tHD;STA = tHIGH = 4.0 us */
 					sda_falling_time,
 					0,	/* 0: DW default, 1: Ideal */
 					0);	/* No offset */
-		lcnt = i2c_dw_scl_lcnt(i2c_dw_clk_rate(dev),
+		lcnt =
+			i2c_dw_scl_lcnt(ic_clk,
 					4700,	/* tLOW = 4.7 us */
 					scl_falling_time,
 					0);	/* No offset */
@@ -106,12 +109,14 @@  static int i2c_dw_init_master(struct dw_i2c_dev *dev)
 		hcnt = dev->fs_hcnt;
 		lcnt = dev->fs_lcnt;
 	} else {
-		hcnt = i2c_dw_scl_hcnt(i2c_dw_clk_rate(dev),
+		hcnt =
+			i2c_dw_scl_hcnt(ic_clk,
 					600,	/* tHD;STA = tHIGH = 0.6 us */
 					sda_falling_time,
 					0,	/* 0: DW default, 1: Ideal */
 					0);	/* No offset */
-		lcnt = i2c_dw_scl_lcnt(i2c_dw_clk_rate(dev),
+		lcnt =
+			i2c_dw_scl_lcnt(ic_clk,
 					1300,	/* tLOW = 1.3 us */
 					scl_falling_time,
 					0);	/* No offset */