[PATCH 148/149] cf_spi.c: Rename CONFIG_SPI_IDLE_VAL to SPI_IDLE_VAL

Tom Rini
2022-12-04T15:34:19Z

This value is never changed by boards, so just rename it to
SPI_IDLE_VAL to fit with the rest of the code.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
drivers/spi/cf_spi.c | 12 ++++++------
drivers/spi/sandbox_spi.c | 4 ----
2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c
index ea23357090fe..1a841b5dcefc 100644
--- a/drivers/spi/cf_spi.c
+++ b/drivers/spi/cf_spi.c
@@ -32,11 +32,11 @@ struct coldfire_spi_priv {

DECLARE_GLOBAL_DATA_PTR;

-#ifndef CONFIG_SPI_IDLE_VAL
+#ifndef SPI_IDLE_VAL
#if defined(CONFIG_SPI_MMC)
-#define CONFIG_SPI_IDLE_VAL 0xFFFF
+#define SPI_IDLE_VAL 0xFFFF
#else
-#define CONFIG_SPI_IDLE_VAL 0x0
+#define SPI_IDLE_VAL 0x0
#endif
#endif

@@ -184,7 +184,7 @@ static int coldfire_spi_xfer(struct udevice *dev, unsigned int bitlen,
}

if (din) {
- cfspi_tx(cfspi, ctrl, CONFIG_SPI_IDLE_VAL);
+ cfspi_tx(cfspi, ctrl, SPI_IDLE_VAL);
if (cfspi->charbit == 16)
*spi_rd16++ = cfspi_rx(cfspi);
else
@@ -208,7 +208,7 @@ static int coldfire_spi_xfer(struct udevice *dev, unsigned int bitlen,
}

if (din) {
- cfspi_tx(cfspi, ctrl, CONFIG_SPI_IDLE_VAL);
+ cfspi_tx(cfspi, ctrl, SPI_IDLE_VAL);
if (cfspi->charbit == 16)
*spi_rd16 = cfspi_rx(cfspi);
else
@@ -216,7 +216,7 @@ static int coldfire_spi_xfer(struct udevice *dev, unsigned int bitlen,
}
} else {
/* dummy read */
- cfspi_tx(cfspi, ctrl, CONFIG_SPI_IDLE_VAL);
+ cfspi_tx(cfspi, ctrl, SPI_IDLE_VAL);
cfspi_rx(cfspi);
}

diff --git a/drivers/spi/sandbox_spi.c b/drivers/spi/sandbox_spi.c
index 0564d8b55e70..f844597d04cf 100644
--- a/drivers/spi/sandbox_spi.c
+++ b/drivers/spi/sandbox_spi.c
@@ -24,10 +24,6 @@
#include <dm/acpi.h>
#include <dm/device-internal.h>

-#ifndef CONFIG_SPI_IDLE_VAL
-# define CONFIG_SPI_IDLE_VAL 0xFF
-#endif
-
/**
* struct sandbox_spi_priv - Sandbox SPI private data
*
--
2.25.1