diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2023-07-10 18:49:30 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-07-11 14:12:56 +0100 |
| commit | 82238d2cbd99ebd09dda48fb7c1c8802097da6a2 (patch) | |
| tree | e10e4206c0cce9fb3ac3181ace5b1b8e4a16521a /drivers/spi/spi.c | |
| parent | 90366cd60133a9f5b6a2f31360367c658585e125 (diff) | |
| download | linux-stable-82238d2cbd99ebd09dda48fb7c1c8802097da6a2.tar.gz linux-stable-82238d2cbd99ebd09dda48fb7c1c8802097da6a2.tar.bz2 linux-stable-82238d2cbd99ebd09dda48fb7c1c8802097da6a2.zip | |
spi: Rename SPI_MASTER_GPIO_SS to SPI_CONTROLLER_GPIO_SS
Rename SPI_MASTER_GPIO_SS to SPI_CONTROLLER_GPIO_SS and
convert the users to SPI_CONTROLLER_GPIO_SS to follow
the new naming shema.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230710154932.68377-14-andriy.shevchenko@linux.intel.com
Reviewed-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 4c90875e5db1..d9667f3f151e 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1006,7 +1006,7 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force) gpiod_set_value_cansleep(spi_get_csgpiod(spi, 0), activate); } /* Some SPI masters need both GPIO CS & slave_select */ - if ((spi->controller->flags & SPI_MASTER_GPIO_SS) && + if ((spi->controller->flags & SPI_CONTROLLER_GPIO_SS) && spi->controller->set_cs) spi->controller->set_cs(spi, !enable); } else if (spi->controller->set_cs) { @@ -3052,7 +3052,7 @@ static int spi_get_gpio_descs(struct spi_controller *ctlr) ctlr->unused_native_cs = ffs(~native_cs_mask) - 1; - if ((ctlr->flags & SPI_MASTER_GPIO_SS) && num_cs_gpios && + if ((ctlr->flags & SPI_CONTROLLER_GPIO_SS) && num_cs_gpios && ctlr->max_native_cs && ctlr->unused_native_cs >= ctlr->max_native_cs) { dev_err(dev, "No unused native chip select available\n"); return -EINVAL; |