diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2021-04-20 19:40:40 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-04-21 16:07:04 +0100 |
| commit | 31ed8ebc7a27c1937184b956727bf71d4adc7df3 (patch) | |
| tree | 94c417dd28ae932f298f0e28068da3c1ba6f8ff7 | |
| parent | 1799bb1065ba6e9be0a1562400cd0b9afdcf65e7 (diff) | |
spi: Make error handling of gpiod_count() call cleaner
Each time we call spi_get_gpio_descs() the num_chipselect is overwritten
either by new value or by the old one. This is an extra operation in case
gpiod_count() returns an error. Besides that it slashes the error handling
of gpiod_count().
Refactor the code to make error handling of gpiod_count() call cleaner.
Note, that gpiod_count() never returns 0, take this into account as well.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210420164040.40055-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | drivers/spi/spi.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index cc6d43d7895f..06db13169231 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2551,13 +2551,14 @@ static int spi_get_gpio_descs(struct spi_controller *ctlr) unsigned int num_cs_gpios = 0; nb = gpiod_count(dev, "cs"); - ctlr->num_chipselect = max_t(int, nb, ctlr->num_chipselect); - - /* No GPIOs at all is fine, else return the error */ - if (nb == 0 || nb == -ENOENT) - return 0; - else if (nb < 0) + if (nb < 0) { + /* No GPIOs at all is fine, else return the error */ + if (nb == -ENOENT) + return 0; return nb; + } + + ctlr->num_chipselect = max_t(int, nb, ctlr->num_chipselect); cs = devm_kcalloc(dev, ctlr->num_chipselect, sizeof(*cs), GFP_KERNEL); |