i2c: mt65xx: convert set_speed function to void

Wolfram Sang · Wolfram Sang · commit d51e7cfca3fe · 2025-10-04T18:55:44.000+02:00
cppcheck rightfully reports:
drivers/i2c/busses/i2c-mt65xx.c:1464:6: warning: Condition 'ret' is always false [knownConditionTrueFalse]

Make the function void and simplify the code.

Signed-off-by: Wolfram Sang &lt;wsa+renesas@sang-engineering.com&gt;
Reviewed-by: AngeloGioacchino Del Regno &lt;angelogioacchino.delregno@collabora.com&gt;
diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c
@@ -868,7 +868,7 @@ static int mtk_i2c_calculate_speed(struct mtk_i2c *i2c, unsigned int clk_src,
 	return 0;
 }
 
-static int mtk_i2c_set_speed(struct mtk_i2c *i2c, unsigned int parent_clk)
+static void mtk_i2c_set_speed(struct mtk_i2c *i2c, unsigned int parent_clk)
 {
 	unsigned int clk_src;
 	unsigned int step_cnt;
@@ -938,9 +938,6 @@ static int mtk_i2c_set_speed(struct mtk_i2c *i2c, unsigned int parent_clk)
 
 		break;
 	}
-
-
-	return 0;
 }
 
 static void i2c_dump_register(struct mtk_i2c *i2c)
@@ -1460,11 +1457,7 @@ static int mtk_i2c_probe(struct platform_device *pdev)
 
 	strscpy(i2c->adap.name, I2C_DRV_NAME, sizeof(i2c->adap.name));
 
-	ret = mtk_i2c_set_speed(i2c, clk_get_rate(i2c->clocks[speed_clk].clk));
-	if (ret) {
-		dev_err(&pdev->dev, "Failed to set the speed.\n");
-		return -EINVAL;
-	}
+	mtk_i2c_set_speed(i2c, clk_get_rate(i2c->clocks[speed_clk].clk));
 
 	if (i2c->dev_comp->max_dma_support > 32) {
 		ret = dma_set_mask(&pdev->dev,

Original file line number	Diff line number	Diff line change
`@@ -868,7 +868,7 @@ static int mtk_i2c_calculate_speed(struct mtk_i2c *i2c, unsigned int clk_src,`
`868`	`868`	`return 0;`
`869`	`869`	`}`
`870`	`870`
`871`		`-static int mtk_i2c_set_speed(struct mtk_i2c *i2c, unsigned int parent_clk)`
	`871`	`+static void mtk_i2c_set_speed(struct mtk_i2c *i2c, unsigned int parent_clk)`
`872`	`872`	`{`
`873`	`873`	`unsigned int clk_src;`
`874`	`874`	`unsigned int step_cnt;`
`@@ -938,9 +938,6 @@ static int mtk_i2c_set_speed(struct mtk_i2c *i2c, unsigned int parent_clk)`
`938`	`938`
`939`	`939`	`break;`
`940`	`940`	`}`
`941`		`-`
`942`		`-`
`943`		`- return 0;`
`944`	`941`	`}`
`945`	`942`
`946`	`943`	`static void i2c_dump_register(struct mtk_i2c *i2c)`
`@@ -1460,11 +1457,7 @@ static int mtk_i2c_probe(struct platform_device *pdev)`
`1460`	`1457`
`1461`	`1458`	`strscpy(i2c->adap.name, I2C_DRV_NAME, sizeof(i2c->adap.name));`
`1462`	`1459`
`1463`		`- ret = mtk_i2c_set_speed(i2c, clk_get_rate(i2c->clocks[speed_clk].clk));`
`1464`		`- if (ret) {`
`1465`		`- dev_err(&pdev->dev, "Failed to set the speed.\n");`
`1466`		`- return -EINVAL;`
`1467`		`- }`
	`1460`	`+ mtk_i2c_set_speed(i2c, clk_get_rate(i2c->clocks[speed_clk].clk));`
`1468`	`1461`
`1469`	`1462`	`if (i2c->dev_comp->max_dma_support > 32) {`
`1470`	`1463`	`ret = dma_set_mask(&pdev->dev,`