Change legacy name master/slave to modern name host/target. No functional changed. Signed-off-by: Yang Yingliang <yangyingliang@xxxxxxxxxx> --- drivers/spi/spi-rspi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index 83bb16995e06..365434a448e4 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c @@ -71,7 +71,7 @@ #define SPCR_SPE 0x40 /* Function Enable */ #define SPCR_SPTIE 0x20 /* Transmit Interrupt Enable */ #define SPCR_SPEIE 0x10 /* Error Interrupt Enable */ -#define SPCR_MSTR 0x08 /* Master/Slave Mode Select */ +#define SPCR_MSTR 0x08 /* Host/Target Mode Select */ #define SPCR_MODFEN 0x04 /* Mode Fault Error Detection Enable */ /* RSPI on SH only */ #define SPCR_TXMD 0x02 /* TX Only Mode (vs. Full Duplex) */ @@ -1000,7 +1000,7 @@ static int rspi_prepare_message(struct spi_controller *ctlr, if (spi->mode & SPI_LSB_FIRST) rspi->spcmd |= SPCMD_LSBF; - /* Configure slave signal to assert */ + /* Configure target signal to assert */ rspi->spcmd |= SPCMD_SSLA(spi_get_csgpiod(spi, 0) ? rspi->ctlr->unused_native_cs : spi_get_chipselect(spi, 0)); @@ -1019,7 +1019,7 @@ static int rspi_prepare_message(struct spi_controller *ctlr, return ret; } - /* Enable SPI function in master mode */ + /* Enable SPI function in host mode */ rspi_write8(rspi, rspi_read8(rspi, RSPI_SPCR) | SPCR_SPE, RSPI_SPCR); return 0; } @@ -1135,7 +1135,7 @@ static int rspi_request_dma(struct device *dev, struct spi_controller *ctlr, unsigned int dma_tx_id, dma_rx_id; if (dev->of_node) { - /* In the OF case we will get the slave IDs from the DT */ + /* In the OF case we will get the target IDs from the DT */ dma_tx_id = 0; dma_rx_id = 0; } else if (rspi_pd && rspi_pd->dma_tx_id && rspi_pd->dma_rx_id) { @@ -1294,7 +1294,7 @@ static int rspi_probe(struct platform_device *pdev) const struct spi_ops *ops; unsigned long clksrc; - ctlr = spi_alloc_master(&pdev->dev, sizeof(struct rspi_data)); + ctlr = spi_alloc_host(&pdev->dev, sizeof(struct rspi_data)); if (ctlr == NULL) return -ENOMEM; -- 2.25.1