iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pps: clients: gpio: Rearrange optional stuff in pps_gpio_setup()

Browse Source 
Rearrange optional stuff in pps_gpio_setup() so it will go after mandatory one
and with reduced indentation. This will increase readability of the sources.

Acked-by: Rodolfo Giometti <giometti@enneenne.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210318130321.24227-7-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andy Shevchenko 2021-03-18 15:03:21 +02:00 committed by Greg Kroah-Hartman
parent 162a5deac6
commit 6b3bc82865
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/pps/clients/pps-gpio.c
View File

@ -110,28 +110,31 @@ static int pps_gpio_setup(struct device *dev)
return dev_err_probe(dev, PTR_ERR(data->gpio_pin), return dev_err_probe(dev, PTR_ERR(data->gpio_pin),
"failed to request PPS GPIO\n"); "failed to request PPS GPIO\n");
data->assert_falling_edge =
device_property_read_bool(dev, "assert-falling-edge");
data->echo_pin = devm_gpiod_get_optional(dev, "echo", GPIOD_OUT_LOW); data->echo_pin = devm_gpiod_get_optional(dev, "echo", GPIOD_OUT_LOW);
if (IS_ERR(data->echo_pin)) if (IS_ERR(data->echo_pin))
return dev_err_probe(dev, PTR_ERR(data->echo_pin), return dev_err_probe(dev, PTR_ERR(data->echo_pin),
"failed to request ECHO GPIO\n"); "failed to request ECHO GPIO\n");
if (data->echo_pin) { if (!data->echo_pin)
ret = device_property_read_u32(dev, "echo-active-ms", &value); return 0;
if (ret) {
dev_err(dev, "failed to get echo-active-ms from FW\n"); ret = device_property_read_u32(dev, "echo-active-ms", &value);
return ret; if (ret) {
} dev_err(dev, "failed to get echo-active-ms from FW\n");
data->echo_active_ms = value; return ret;
/* sanity check on echo_active_ms */
if (!data->echo_active_ms || data->echo_active_ms > 999) {
dev_err(dev, "echo-active-ms: %u - bad value from FW\n",
data->echo_active_ms);
return -EINVAL;
}
} }
data->assert_falling_edge = /* sanity check on echo_active_ms */
device_property_read_bool(dev, "assert-falling-edge"); if (!value || value > 999) {
dev_err(dev, "echo-active-ms: %u - bad value from FW\n", value);
return -EINVAL;
}
data->echo_active_ms = value;
return 0; return 0;
} }