mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
spi: xcomm: switch to use modern name
Change legacy name master to modern name host or controller. No functional changed. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Link: https://msgid.link/r/20231128093031.3707034-20-yangyingliang@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
4c2ee09910
commit
4e4856e721
@ -132,10 +132,10 @@ static int spi_xcomm_txrx_bufs(struct spi_xcomm *spi_xcomm,
|
||||
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_xcomm *spi_xcomm = spi_master_get_devdata(master);
|
||||
struct spi_xcomm *spi_xcomm = spi_controller_get_devdata(host);
|
||||
unsigned int settings = spi_xcomm->settings;
|
||||
struct spi_device *spi = msg->spi;
|
||||
unsigned cs_change = 0;
|
||||
@ -197,7 +197,7 @@ static int spi_xcomm_transfer_one(struct spi_master *master,
|
||||
spi_xcomm_chipselect(spi_xcomm, spi, false);
|
||||
|
||||
msg->status = status;
|
||||
spi_finalize_current_message(master);
|
||||
spi_finalize_current_message(host);
|
||||
|
||||
return status;
|
||||
}
|
||||
@ -205,27 +205,27 @@ static int spi_xcomm_transfer_one(struct spi_master *master,
|
||||
static int spi_xcomm_probe(struct i2c_client *i2c)
|
||||
{
|
||||
struct spi_xcomm *spi_xcomm;
|
||||
struct spi_master *master;
|
||||
struct spi_controller *host;
|
||||
int ret;
|
||||
|
||||
master = spi_alloc_master(&i2c->dev, sizeof(*spi_xcomm));
|
||||
if (!master)
|
||||
host = spi_alloc_host(&i2c->dev, sizeof(*spi_xcomm));
|
||||
if (!host)
|
||||
return -ENOMEM;
|
||||
|
||||
spi_xcomm = spi_master_get_devdata(master);
|
||||
spi_xcomm = spi_controller_get_devdata(host);
|
||||
spi_xcomm->i2c = i2c;
|
||||
|
||||
master->num_chipselect = 16;
|
||||
master->mode_bits = SPI_CPHA | SPI_CPOL | SPI_3WIRE;
|
||||
master->bits_per_word_mask = SPI_BPW_MASK(8);
|
||||
master->flags = SPI_CONTROLLER_HALF_DUPLEX;
|
||||
master->transfer_one_message = spi_xcomm_transfer_one;
|
||||
master->dev.of_node = i2c->dev.of_node;
|
||||
i2c_set_clientdata(i2c, master);
|
||||
host->num_chipselect = 16;
|
||||
host->mode_bits = SPI_CPHA | SPI_CPOL | SPI_3WIRE;
|
||||
host->bits_per_word_mask = SPI_BPW_MASK(8);
|
||||
host->flags = SPI_CONTROLLER_HALF_DUPLEX;
|
||||
host->transfer_one_message = spi_xcomm_transfer_one;
|
||||
host->dev.of_node = i2c->dev.of_node;
|
||||
i2c_set_clientdata(i2c, host);
|
||||
|
||||
ret = devm_spi_register_master(&i2c->dev, master);
|
||||
ret = devm_spi_register_controller(&i2c->dev, host);
|
||||
if (ret < 0)
|
||||
spi_master_put(master);
|
||||
spi_controller_put(host);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user