diff options
| author | Sam Hurst <shurst@google.com> | 2020-08-03 13:06:42 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-08-05 18:41:25 +0000 |
| commit | dede4e01ae4c877bb05d671087a6e85a29a0f902 (patch) | |
| tree | 8aaaba7b7ce04c059ecd4df4de8a5609492065db /chip/mec1322 | |
| parent | e891cd5ebbb08c9101f1802c2dfcec755718d23f (diff) | |
| download | chrome-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/mec1322')
| -rw-r--r-- | chip/mec1322/i2c.c | 4 | ||||
| -rw-r--r-- | chip/mec1322/lpc.c | 4 | ||||
| -rw-r--r-- | chip/mec1322/registers.h | 2 | ||||
| -rw-r--r-- | chip/mec1322/spi.c | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/chip/mec1322/i2c.c b/chip/mec1322/i2c.c index fe72b870ef..69344d8390 100644 --- a/chip/mec1322/i2c.c +++ b/chip/mec1322/i2c.c @@ -348,7 +348,7 @@ int chip_i2c_xfer(const int port, cdata[controller].transaction_state = I2C_TRANSACTION_OPEN; - /* Skip over the dummy byte */ + /* Skip over the unused byte */ skip = 1; in_size++; } @@ -388,7 +388,7 @@ int chip_i2c_xfer(const int port, /* * We need to know our stop point two bytes in * advance. If we don't know soon enough, we need - * to do an extra dummy read (to last_addr + 1) to + * to do an extra read (to last_addr + 1) to * issue the stop. */ push_in_buf(&in, MEC1322_I2C_DATA(controller), diff --git a/chip/mec1322/lpc.c b/chip/mec1322/lpc.c index 69fe3b856c..020cd0e23e 100644 --- a/chip/mec1322/lpc.c +++ b/chip/mec1322/lpc.c @@ -454,9 +454,9 @@ void lpc_keyboard_put_char(uint8_t chr, int send_irq) void lpc_keyboard_clear_buffer(void) { - volatile char dummy __attribute__((unused)); + volatile char unused __attribute__((unused)); - dummy = MEC1322_8042_OBF_CLR; + unused = MEC1322_8042_OBF_CLR; } void lpc_keyboard_resume_irq(void) diff --git a/chip/mec1322/registers.h b/chip/mec1322/registers.h index 7e5bbc7cea..c59b590ef8 100644 --- a/chip/mec1322/registers.h +++ b/chip/mec1322/registers.h @@ -118,7 +118,7 @@ static inline uintptr_t gpio_port_base(int port_id) } #define MEC1322_GPIO_CTL(port, id) REG32(gpio_port_base(port) + (id << 2)) -#define DUMMY_GPIO_BANK 0 +#define UNIMPLEMENTED_GPIO_BANK 0 /* Timer */ diff --git a/chip/mec1322/spi.c b/chip/mec1322/spi.c index 834fbd10b1..ba58bfb0bd 100644 --- a/chip/mec1322/spi.c +++ b/chip/mec1322/spi.c @@ -60,14 +60,14 @@ static int spi_tx(const int port, const uint8_t *txdata, int txlen) { int i; int ret = EC_SUCCESS; - uint8_t dummy __attribute__((unused)) = 0; + uint8_t unused __attribute__((unused)) = 0; for (i = 0; i < txlen; ++i) { MEC1322_SPI_TD(port) = txdata[i]; ret = wait_byte(port); if (ret != EC_SUCCESS) return ret; - dummy = MEC1322_SPI_RD(port); + unused = MEC1322_SPI_RD(port); } return ret; @@ -103,7 +103,7 @@ int spi_transaction_flush(const struct spi_device_t *spi_device) { int port = spi_device->port; int ret = dma_wait(SPI_DMA_CHANNEL(port)); - uint8_t dummy __attribute__((unused)) = 0; + uint8_t unused __attribute__((unused)) = 0; timestamp_t deadline; @@ -121,7 +121,7 @@ int spi_transaction_flush(const struct spi_device_t *spi_device) dma_disable(SPI_DMA_CHANNEL(port)); dma_clear_isr(SPI_DMA_CHANNEL(port)); if (MEC1322_SPI_SR(port) & 0x2) - dummy = MEC1322_SPI_RD(port); + unused = MEC1322_SPI_RD(port); gpio_set_level(spi_device->gpio_cs, 1); |