mirror of
https://github.com/torvalds/linux.git
synced 2026-07-31 19:47:08 +02:00
i2c: rcar: avoid non-standard use of goto
Kernel functions goto somewhere on error conditions. Using goto for the default path is irritating. Let's bail out on error instead and use a proper retval. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
parent
f78ca48a8b
commit
be944ceb67
|
|
@ -317,12 +317,12 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_priv *priv)
|
|||
for (scgd = 0; scgd < 0x40; scgd++) {
|
||||
scl = ick / (20 + (scgd * 8) + round);
|
||||
if (scl <= t.bus_freq_hz)
|
||||
goto scgd_find;
|
||||
break;
|
||||
}
|
||||
dev_err(dev, "it is impossible to calculate best SCL\n");
|
||||
return -EIO;
|
||||
|
||||
scgd_find:
|
||||
if (scgd == 0x40)
|
||||
goto err_no_val;
|
||||
|
||||
dev_dbg(dev, "clk %d/%d(%lu), round %u, CDF:0x%x, SCGD: 0x%x\n",
|
||||
scl, t.bus_freq_hz, rate, round, cdf, scgd);
|
||||
|
||||
|
|
@ -330,6 +330,10 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_priv *priv)
|
|||
priv->icccr = scgd << cdf_width | cdf;
|
||||
|
||||
return 0;
|
||||
|
||||
err_no_val:
|
||||
dev_err(dev, "it is impossible to calculate best SCL\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user