diff options
| author | Marek Vasut <[email protected]> | 2025-10-31 23:43:43 +0100 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-02-13 10:38:33 -0600 |
| commit | 10e84cc16a1cfb3c70914cb524090c7e5411a37d (patch) | |
| tree | 6b34a1557ccdb4ad0a349d7e6377fbe6475ffa6f | |
| parent | 59fa20f729789d12e7815fede6f5b3fb280dcdc9 (diff) | |
spi: Clean up more of the stacked parallel ifdeffery
Invert the conditional when to exit, and fall back to common code
in the default case. This should have no functional impact on either
code path.
Signed-off-by: Marek Vasut <[email protected]>
| -rw-r--r-- | drivers/spi/spi-uclass.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index a7a06312435..7a4e6d0fc5c 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -180,25 +180,22 @@ int spi_write_then_read(struct spi_slave *slave, const u8 *opcode, static int spi_child_post_bind(struct udevice *dev) { struct dm_spi_slave_plat *plat = dev_get_parent_plat(dev); - int __maybe_unused ret; int mode = 0; int value; + int ret; if (!dev_has_ofnode(dev)) return 0; -#if CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL) - ret = dev_read_u32_array(dev, "reg", plat->cs, SPI_CS_CNT_MAX); - - if (ret == -EOVERFLOW || ret == -FDT_ERR_BADLAYOUT) { - dev_read_u32(dev, "reg", &plat->cs[0]); - } else { - dev_err(dev, "has no valid 'reg' property (%d)\n", ret); - return ret; + if (CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL)) { + ret = dev_read_u32_array(dev, "reg", plat->cs, SPI_CS_CNT_MAX); + if (ret && ret != -EOVERFLOW && ret != -FDT_ERR_BADLAYOUT) { + dev_err(dev, "has no valid 'reg' property (%d)\n", ret); + return ret; + } } -#else + plat->cs[0] = dev_read_u32_default(dev, "reg", -1); -#endif plat->max_hz = dev_read_u32_default(dev, "spi-max-frequency", SPI_DEFAULT_SPEED_HZ); |