| Message ID | 20190907101848.hl4vgaostftr4ddj@arbad (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iio: adc: hx711: fix and optimize sampling of data | expand |
On Sat, 2019-09-07 at 12:18 +0200, Andreas Klinger wrote: > Optimize use of return in hx711_set_gain_for_channel(). I believe this change is not an optimization but this change does make the code harder to read. > diff --git a/drivers/iio/adc/hx711.c b/drivers/iio/adc/hx711.c [] > @@ -213,7 +213,7 @@ static int hx711_reset(struct hx711_data *hx711_data) > > static int hx711_set_gain_for_channel(struct hx711_data *hx711_data, int chan) > { > - int ret; > + int ret = 0; > > if (chan == 0) { > if (hx711_data->gain_set == 32) { > @@ -224,8 +224,6 @@ static int hx711_set_gain_for_channel(struct hx711_data *hx711_data, int chan) > return ret; > > ret = hx711_wait_for_ready(hx711_data); > - if (ret) > - return ret; > } > } else { > if (hx711_data->gain_set != 32) { > @@ -236,12 +234,10 @@ static int hx711_set_gain_for_channel(struct hx711_data *hx711_data, int chan) > return ret; > > ret = hx711_wait_for_ready(hx711_data); > - if (ret) > - return ret; > } > } > > - return 0; > + return ret; > } > > static int hx711_reset_read(struct hx711_data *hx711_data, int chan)
diff --git a/drivers/iio/adc/hx711.c b/drivers/iio/adc/hx711.c index c8686558429b..20c249f502c0 100644 --- a/drivers/iio/adc/hx711.c +++ b/drivers/iio/adc/hx711.c @@ -213,7 +213,7 @@ static int hx711_reset(struct hx711_data *hx711_data) static int hx711_set_gain_for_channel(struct hx711_data *hx711_data, int chan) { - int ret; + int ret = 0; if (chan == 0) { if (hx711_data->gain_set == 32) { @@ -224,8 +224,6 @@ static int hx711_set_gain_for_channel(struct hx711_data *hx711_data, int chan) return ret; ret = hx711_wait_for_ready(hx711_data); - if (ret) - return ret; } } else { if (hx711_data->gain_set != 32) { @@ -236,12 +234,10 @@ static int hx711_set_gain_for_channel(struct hx711_data *hx711_data, int chan) return ret; ret = hx711_wait_for_ready(hx711_data); - if (ret) - return ret; } } - return 0; + return ret; } static int hx711_reset_read(struct hx711_data *hx711_data, int chan)
Optimize use of return in hx711_set_gain_for_channel(). Signed-off-by: Andreas Klinger <ak@it-klinger.de> --- drivers/iio/adc/hx711.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)