summaryrefslogtreecommitdiff
path: root/chip/lm4
diff options
context:
space:
mode:
authorSam Hurst <shurst@google.com>2020-08-03 13:06:42 -0700
committerCommit Bot <commit-bot@chromium.org>2020-08-05 18:41:25 +0000
commitdede4e01ae4c877bb05d671087a6e85a29a0f902 (patch)
tree8aaaba7b7ce04c059ecd4df4de8a5609492065db /chip/lm4
parente891cd5ebbb08c9101f1802c2dfcec755718d23f (diff)
downloadchrome-ec-dede4e01ae4c877bb05d671087a6e85a29a0f902.tar.gz
ec: change usage of dummy
Google is working to change its source code to use more inclusive language. To that end, replace the term "dummy" with inclusive alternatives. BUG=b:162781382 BRANCH=None TEST=make -j buildall `grep -ir dummy *` The only results are in "private/nordic_keyboard/sdk8.0.0" which is not our code. Signed-off-by: Sam Hurst <shurst@google.com> Change-Id: I6a42183d998e4db4bb61625f962867fda10722e2 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2335737 Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Diffstat (limited to 'chip/lm4')
-rw-r--r--chip/lm4/adc_chip.h2
-rw-r--r--chip/lm4/lpc.c2
-rw-r--r--chip/lm4/registers.h2
-rw-r--r--chip/lm4/spi.c8
-rw-r--r--chip/lm4/watchdog.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/chip/lm4/adc_chip.h b/chip/lm4/adc_chip.h
index 8cf033b128..b43bec2da3 100644
--- a/chip/lm4/adc_chip.h
+++ b/chip/lm4/adc_chip.h
@@ -42,7 +42,7 @@ extern const struct adc_t adc_channels[];
/* Just plain id mapping for code readability */
#define LM4_AIN(x) (x)
-/* Dummy value for "channel" in adc_t if we don't have an external channel. */
+/* Mock value for "channel" in adc_t if we don't have an external channel. */
#define LM4_AIN_NONE (-1)
#endif /* __CROS_EC_ADC_CHIP_H */
diff --git a/chip/lm4/lpc.c b/chip/lm4/lpc.c
index 0c672bd63a..5b146ba32a 100644
--- a/chip/lm4/lpc.c
+++ b/chip/lm4/lpc.c
@@ -768,7 +768,7 @@ static void lpc_init(void)
while (!(LM4_LPC_ST(LPC_CH_MEMMAP) & 0x10)) {
/* Clear HW1ST */
LM4_LPC_ST(LPC_CH_MEMMAP) &= ~0x40;
- /* Do a dummy slave write; this should cause SW1ST to be set */
+ /* Do a slave write; this should cause SW1ST to be set */
*LPC_POOL_MEMMAP = *LPC_POOL_MEMMAP;
}
diff --git a/chip/lm4/registers.h b/chip/lm4/registers.h
index da4741a344..0c59da19f6 100644
--- a/chip/lm4/registers.h
+++ b/chip/lm4/registers.h
@@ -489,7 +489,7 @@ enum clock_gate_offsets {
#define GPIO_P LM4_GPIO_P
#define GPIO_Q LM4_GPIO_Q
-#define DUMMY_GPIO_BANK GPIO_A
+#define UNIMPLEMENTED_GPIO_BANK GPIO_A
/* Value to write to LM4_GPIO_LOCK to unlock writes */
#define LM4_GPIO_LOCK_UNLOCK 0x4c4f434b
diff --git a/chip/lm4/spi.c b/chip/lm4/spi.c
index 6df3d9e3ee..be988b78a0 100644
--- a/chip/lm4/spi.c
+++ b/chip/lm4/spi.c
@@ -65,12 +65,12 @@ int spi_transaction(const struct spi_device_t *spi_device,
int totallen = txlen + rxlen;
int txcount = 0, rxcount = 0;
static struct mutex spi_mutex;
- volatile uint32_t dummy __attribute__((unused));
+ volatile uint32_t unused __attribute__((unused));
mutex_lock(&spi_mutex);
/* Empty the receive FIFO */
while (LM4_SSI_SR(0) & LM4_SSI_SR_RNE)
- dummy = LM4_SSI_DR(0);
+ unused = LM4_SSI_DR(0);
/* Start transaction. Need to do this explicitly because the LM4
* SSI controller pulses its frame select every byte, and the EEPROM
@@ -85,7 +85,7 @@ int spi_transaction(const struct spi_device_t *spi_device,
if (rxcount < txlen) {
/* Throw away bytes received while we were
transmitting */
- dummy = LM4_SSI_DR(0);
+ unused = LM4_SSI_DR(0);
} else
*(rxdata++) = LM4_SSI_DR(0);
rxcount++;
@@ -96,7 +96,7 @@ int spi_transaction(const struct spi_device_t *spi_device,
if (txcount < txlen)
LM4_SSI_DR(0) = *(txdata++);
else {
- /* Clock out dummy byte so we can clock in the
+ /* Clock out unused byte so we can clock in the
* response byte */
LM4_SSI_DR(0) = 0;
}
diff --git a/chip/lm4/watchdog.c b/chip/lm4/watchdog.c
index 910cb87e03..50f122bf02 100644
--- a/chip/lm4/watchdog.c
+++ b/chip/lm4/watchdog.c
@@ -65,7 +65,7 @@ void watchdog_reload(void)
if (status) {
LM4_WATCHDOG_ICR(0) = status;
/* That doesn't seem to unpend the watchdog interrupt (even if
- * we do dummy writes to force the write to be committed), so
+ * we do writes to force the write to be committed), so
* explicitly unpend the interrupt before re-enabling it. */
task_clear_pending_irq(LM4_IRQ_WATCHDOG);
task_enable_irq(LM4_IRQ_WATCHDOG);