Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 09:16:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

spi: sc18is602: switch to use modern name

Browse Source 
Change legacy name master to modern name host or controller.

No functional changed.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20230818093154.1183529-18-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Yang Yingliang 2023-08-18 17:31:48 +08:00 committed by Mark Brown
parent f4bc49eda2
commit 82a7792318
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/spi/spi-sc18is602.c
View File

@ -30,7 +30,7 @@ enum chips { sc18is602, sc18is602b, sc18is603 };
#define SC18IS602_MODE_CLOCK_DIV_128 0x3 #define SC18IS602_MODE_CLOCK_DIV_128 0x3
struct sc18is602 { struct sc18is602 {
struct spi_master *master; struct spi_controller *host;
struct device *dev; struct device *dev;
u8 ctrl; u8 ctrl;
u32 freq; u32 freq;
@ -179,10 +179,10 @@ static int sc18is602_check_transfer(struct spi_device *spi,
return 0; return 0;
} }
static int sc18is602_transfer_one(struct spi_master *master, static int sc18is602_transfer_one(struct spi_controller *host,
struct spi_message *m) struct spi_message *m)
{ {
struct sc18is602 *hw = spi_master_get_devdata(master); struct sc18is602 *hw = spi_controller_get_devdata(host);
struct spi_device *spi = m->spi; struct spi_device *spi = m->spi;
struct spi_transfer *t; struct spi_transfer *t;
int status = 0; int status = 0;
@ -213,7 +213,7 @@ static int sc18is602_transfer_one(struct spi_master *master,
spi_transfer_delay_exec(t); spi_transfer_delay_exec(t);
} }
m->status = status; m->status = status;
spi_finalize_current_message(master); spi_finalize_current_message(host);
return status; return status;
} }
@ -225,7 +225,7 @@ static size_t sc18is602_max_transfer_size(struct spi_device *spi)
static int sc18is602_setup(struct spi_device *spi) static int sc18is602_setup(struct spi_device *spi)
{ {
struct sc18is602 *hw = spi_master_get_devdata(spi->master); struct sc18is602 *hw = spi_controller_get_devdata(spi->controller);
/* SC18IS602 does not support CS2 */ /* SC18IS602 does not support CS2 */
if (hw->id == sc18is602 && (spi_get_chipselect(spi, 0) == 2)) if (hw->id == sc18is602 && (spi_get_chipselect(spi, 0) == 2))
@ -241,17 +241,17 @@ static int sc18is602_probe(struct i2c_client *client)
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct sc18is602_platform_data *pdata = dev_get_platdata(dev); struct sc18is602_platform_data *pdata = dev_get_platdata(dev);
struct sc18is602 *hw; struct sc18is602 *hw;
struct spi_master *master; struct spi_controller *host;
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C | if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C |
I2C_FUNC_SMBUS_WRITE_BYTE_DATA)) I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
return -EINVAL; return -EINVAL;
master = devm_spi_alloc_master(dev, sizeof(struct sc18is602)); host = devm_spi_alloc_host(dev, sizeof(struct sc18is602));
if (!master) if (!host)
return -ENOMEM; return -ENOMEM;
hw = spi_master_get_devdata(master); hw = spi_controller_get_devdata(host);
i2c_set_clientdata(client, hw); i2c_set_clientdata(client, hw);
/* assert reset and then release */ /* assert reset and then release */
@ -260,7 +260,7 @@ static int sc18is602_probe(struct i2c_client *client)
return PTR_ERR(hw->reset); return PTR_ERR(hw->reset);
gpiod_set_value_cansleep(hw->reset, 0); gpiod_set_value_cansleep(hw->reset, 0);
hw->master = master; hw->host = host;
hw->client = client; hw->client = client;
hw->dev = dev; hw->dev = dev;
hw->ctrl = 0xff; hw->ctrl = 0xff;
@ -273,11 +273,11 @@ static int sc18is602_probe(struct i2c_client *client)
switch (hw->id) { switch (hw->id) {
case sc18is602: case sc18is602:
case sc18is602b: case sc18is602b:
master->num_chipselect = 4; host->num_chipselect = 4;
hw->freq = SC18IS602_CLOCK; hw->freq = SC18IS602_CLOCK;
break; break;
case sc18is603: case sc18is603:
master->num_chipselect = 2; host->num_chipselect = 2;
if (pdata) { if (pdata) {
hw->freq = pdata->clock_frequency; hw->freq = pdata->clock_frequency;
} else { } else {
@ -292,18 +292,18 @@ static int sc18is602_probe(struct i2c_client *client)
hw->freq = SC18IS602_CLOCK; hw->freq = SC18IS602_CLOCK;
break; break;
} }
master->bus_num = np ? -1 : client->adapter->nr; host->bus_num = np ? -1 : client->adapter->nr;
master->mode_bits = SPI_CPHA | SPI_CPOL | SPI_LSB_FIRST; host->mode_bits = SPI_CPHA | SPI_CPOL | SPI_LSB_FIRST;
master->bits_per_word_mask = SPI_BPW_MASK(8); host->bits_per_word_mask = SPI_BPW_MASK(8);
master->setup = sc18is602_setup; host->setup = sc18is602_setup;
master->transfer_one_message = sc18is602_transfer_one; host->transfer_one_message = sc18is602_transfer_one;
master->max_transfer_size = sc18is602_max_transfer_size; host->max_transfer_size = sc18is602_max_transfer_size;
master->max_message_size = sc18is602_max_transfer_size; host->max_message_size = sc18is602_max_transfer_size;
master->dev.of_node = np; host->dev.of_node = np;
master->min_speed_hz = hw->freq / 128; host->min_speed_hz = hw->freq / 128;
master->max_speed_hz = hw->freq / 4; host->max_speed_hz = hw->freq / 4;
return devm_spi_register_master(dev, master); return devm_spi_register_controller(dev, host);
} }
static const struct i2c_device_id sc18is602_id[] = { static const struct i2c_device_id sc18is602_id[] = {
@ -342,6 +342,6 @@ static struct i2c_driver sc18is602_driver = {
module_i2c_driver(sc18is602_driver); module_i2c_driver(sc18is602_driver);
MODULE_DESCRIPTION("SC18IS602/603 SPI Master Driver"); MODULE_DESCRIPTION("SC18IS602/603 SPI Host Driver");
MODULE_AUTHOR("Guenter Roeck"); MODULE_AUTHOR("Guenter Roeck");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");