github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-24 06:24:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

iio: adc: hx711: pass trailing pulse count into hx711_read

Browse Source 
Move the trailing-pulse selection out of hx711_read() and into its
callers.

This is a preparatory change so later variant-specific code can pass the
per-channel pulse count without adding a separate read path.

No functional change.

Signed-off-by: Piyush Patle <piyushpatle228@gmail.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Piyush Patle 2026-06-04 00:18:55 +05:30 committed by Jonathan Cameron
parent e301c363db
commit 44a6b355da
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/iio/adc/hx711.c
View File

@ -155,7 +155,7 @@ static int hx711_cycle(struct hx711_data *hx711_data)
return gpiod_get_value(hx711_data->gpiod_dout);
}
static int hx711_read(struct hx711_data *hx711_data)
static int hx711_read(struct hx711_data *hx711_data, int trailing_pulses)
{
int i, ret;
int value = 0;
@ -174,7 +174,7 @@ static int hx711_read(struct hx711_data *hx711_data)
value ^= 0x800000;
for (i = 0; i < hx711_get_gain_to_pulse(hx711_data->gain_set); i++)
for (i = 0; i < trailing_pulses; i++)
hx711_cycle(hx711_data);
return value;
@ -237,7 +237,8 @@ static int hx711_set_gain_for_channel(struct hx711_data *hx711_data, int chan)
if (hx711_data->gain_set == 32) {
hx711_data->gain_set = hx711_data->gain_chan_a;
ret = hx711_read(hx711_data);
ret = hx711_read(hx711_data,
hx711_get_gain_to_pulse(hx711_data->gain_set));
if (ret < 0)
return ret;
@ -249,7 +250,8 @@ static int hx711_set_gain_for_channel(struct hx711_data *hx711_data, int chan)
if (hx711_data->gain_set != 32) {
hx711_data->gain_set = 32;
ret = hx711_read(hx711_data);
ret = hx711_read(hx711_data,
hx711_get_gain_to_pulse(hx711_data->gain_set));
if (ret < 0)
return ret;
@ -264,8 +266,8 @@ static int hx711_set_gain_for_channel(struct hx711_data *hx711_data, int chan)
static int hx711_reset_read(struct hx711_data *hx711_data, int chan)
{
int trailing_pulses;
int ret;
int val;
/*
* hx711_reset() must be called from here
@ -280,9 +282,8 @@ static int hx711_reset_read(struct hx711_data *hx711_data, int chan)
if (ret < 0)
return ret;
val = hx711_read(hx711_data);
return val;
trailing_pulses = hx711_get_gain_to_pulse(hx711_data->gain_set);
return hx711_read(hx711_data, trailing_pulses);
}
static int hx711_read_raw(struct iio_dev *indio_dev,
@ -349,7 +350,8 @@ static int hx711_write_raw(struct iio_dev *indio_dev,
if (gain != 32)
hx711_data->gain_chan_a = gain;
ret = hx711_read(hx711_data);
ret = hx711_read(hx711_data,
hx711_get_gain_to_pulse(hx711_data->gain_set));
if (ret < 0) {
mutex_unlock(&hx711_data->lock);
return ret;