Commit 4e4856e7 authored by Yang Yingliang's avatar Yang Yingliang Committed by Mark Brown

spi: xcomm: switch to use modern name

Change legacy name master to modern name host or controller.

No functional changed.
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Link: https://msgid.link/r/20231128093031.3707034-20-yangyingliang@huawei.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4c2ee099
...@@ -132,10 +132,10 @@ static int spi_xcomm_txrx_bufs(struct spi_xcomm *spi_xcomm, ...@@ -132,10 +132,10 @@ static int spi_xcomm_txrx_bufs(struct spi_xcomm *spi_xcomm,
return t->len; return t->len;
} }
static int spi_xcomm_transfer_one(struct spi_master *master, static int spi_xcomm_transfer_one(struct spi_controller *host,
struct spi_message *msg) struct spi_message *msg)
{ {
struct spi_xcomm *spi_xcomm = spi_master_get_devdata(master); struct spi_xcomm *spi_xcomm = spi_controller_get_devdata(host);
unsigned int settings = spi_xcomm->settings; unsigned int settings = spi_xcomm->settings;
struct spi_device *spi = msg->spi; struct spi_device *spi = msg->spi;
unsigned cs_change = 0; unsigned cs_change = 0;
...@@ -197,7 +197,7 @@ static int spi_xcomm_transfer_one(struct spi_master *master, ...@@ -197,7 +197,7 @@ static int spi_xcomm_transfer_one(struct spi_master *master,
spi_xcomm_chipselect(spi_xcomm, spi, false); spi_xcomm_chipselect(spi_xcomm, spi, false);
msg->status = status; msg->status = status;
spi_finalize_current_message(master); spi_finalize_current_message(host);
return status; return status;
} }
...@@ -205,27 +205,27 @@ static int spi_xcomm_transfer_one(struct spi_master *master, ...@@ -205,27 +205,27 @@ static int spi_xcomm_transfer_one(struct spi_master *master,
static int spi_xcomm_probe(struct i2c_client *i2c) static int spi_xcomm_probe(struct i2c_client *i2c)
{ {
struct spi_xcomm *spi_xcomm; struct spi_xcomm *spi_xcomm;
struct spi_master *master; struct spi_controller *host;
int ret; int ret;
master = spi_alloc_master(&i2c->dev, sizeof(*spi_xcomm)); host = spi_alloc_host(&i2c->dev, sizeof(*spi_xcomm));
if (!master) if (!host)
return -ENOMEM; return -ENOMEM;
spi_xcomm = spi_master_get_devdata(master); spi_xcomm = spi_controller_get_devdata(host);
spi_xcomm->i2c = i2c; spi_xcomm->i2c = i2c;
master->num_chipselect = 16; host->num_chipselect = 16;
master->mode_bits = SPI_CPHA | SPI_CPOL | SPI_3WIRE; host->mode_bits = SPI_CPHA | SPI_CPOL | SPI_3WIRE;
master->bits_per_word_mask = SPI_BPW_MASK(8); host->bits_per_word_mask = SPI_BPW_MASK(8);
master->flags = SPI_CONTROLLER_HALF_DUPLEX; host->flags = SPI_CONTROLLER_HALF_DUPLEX;
master->transfer_one_message = spi_xcomm_transfer_one; host->transfer_one_message = spi_xcomm_transfer_one;
master->dev.of_node = i2c->dev.of_node; host->dev.of_node = i2c->dev.of_node;
i2c_set_clientdata(i2c, master); i2c_set_clientdata(i2c, host);
ret = devm_spi_register_master(&i2c->dev, master); ret = devm_spi_register_controller(&i2c->dev, host);
if (ret < 0) if (ret < 0)
spi_master_put(master); spi_controller_put(host);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment