瀏覽代碼

Fix warnings introduced by I2C bus speed setting patch

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Kumar Gala 17 年之前
父節點
當前提交
3e3f766a52
共有 1 個文件被更改,包括 3 次插入4 次删除
  1. 3 4
      drivers/i2c/fsl_i2c.c

+ 3 - 4
drivers/i2c/fsl_i2c.c

@@ -117,7 +117,6 @@ static unsigned int set_i2c_bus_speed(const struct fsl_i2c *dev,
 {
 	unsigned short divider = min(i2c_clk / speed, (unsigned short) -1);
 	unsigned int i;
-	u8 fdr, dfsr;
 
 	/*
 	 * We want to choose an FDR/DFSR that generates an I2C bus speed that
@@ -128,15 +127,15 @@ static unsigned int set_i2c_bus_speed(const struct fsl_i2c *dev,
 
 	for (i = 0; i < ARRAY_SIZE(fsl_i2c_speed_map); i++)
 		if (fsl_i2c_speed_map[i].divider >= divider) {
+			u8 fdr, dfsr;
 			dfsr = fsl_i2c_speed_map[i].dfsr;
 			fdr = fsl_i2c_speed_map[i].fdr;
 			speed = i2c_clk / fsl_i2c_speed_map[i].divider;
+			writeb(fdr, &dev->fdr);		/* set bus speed */
+			writeb(dfsr, &dev->dfsrr);	/* set default filter */
 			break;
 		}
 
-	writeb(fdr, &dev->fdr);			/* set bus speed */
-	writeb(dfsr, &dev->dfsrr);		/* set default filter */
-
 	return speed;
 }