Skip to content

Commit f4bc49e

Browse files
Yang Yingliangbroonie
Yang Yingliang
authored and
broonie
committed
spi: s3c64xx: switch to use modern name
Change legacy name master/slave to modern name host/target or controller. No functional changed. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Link: https://lore.kernel.org/r/20230818093154.1183529-17-yangyingliang@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 6536da6 commit f4bc49e

1 file changed

Lines changed: 63 additions & 63 deletions

File tree

‎drivers/spi/spi-s3c64xx.c‎

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ struct s3c64xx_spi_port_config {
163163
* struct s3c64xx_spi_driver_data - Runtime info holder for SPI driver.
164164
* @clk: Pointer to the spi clock.
165165
* @src_clk: Pointer to the clock used to generate SPI signals.
166-
* @ioclk: Pointer to the i/o clock between master and slave
166+
* @ioclk: Pointer to the i/o clock between host and target
167167
* @pdev: Pointer to device's platform device data
168-
* @master: Pointer to the SPI Protocol master.
168+
* @host: Pointer to the SPI Protocol host.
169169
* @cntrlr_info: Platform specific data for the controller this driver manages.
170170
* @lock: Controller specific lock.
171171
* @state: Set of FLAGS to indicate status.
@@ -186,7 +186,7 @@ struct s3c64xx_spi_driver_data {
186186
struct clk *src_clk;
187187
struct clk *ioclk;
188188
struct platform_device *pdev;
189-
struct spi_master *master;
189+
struct spi_controller *host;
190190
struct s3c64xx_spi_info *cntrlr_info;
191191
spinlock_t lock;
192192
unsigned long sfr_start;
@@ -329,7 +329,7 @@ static int prepare_dma(struct s3c64xx_spi_dma_data *dma,
329329
static void s3c64xx_spi_set_cs(struct spi_device *spi, bool enable)
330330
{
331331
struct s3c64xx_spi_driver_data *sdd =
332-
spi_master_get_devdata(spi->master);
332+
spi_controller_get_devdata(spi->controller);
333333

334334
if (sdd->cntrlr_info->no_cs)
335335
return;
@@ -351,9 +351,9 @@ static void s3c64xx_spi_set_cs(struct spi_device *spi, bool enable)
351351
}
352352
}
353353

354-
static int s3c64xx_spi_prepare_transfer(struct spi_master *spi)
354+
static int s3c64xx_spi_prepare_transfer(struct spi_controller *spi)
355355
{
356-
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(spi);
356+
struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(spi);
357357

358358
if (is_polling(sdd))
359359
return 0;
@@ -381,9 +381,9 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi)
381381
return 0;
382382
}
383383

384-
static int s3c64xx_spi_unprepare_transfer(struct spi_master *spi)
384+
static int s3c64xx_spi_unprepare_transfer(struct spi_controller *spi)
385385
{
386-
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(spi);
386+
struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(spi);
387387

388388
if (is_polling(sdd))
389389
return 0;
@@ -399,11 +399,11 @@ static int s3c64xx_spi_unprepare_transfer(struct spi_master *spi)
399399
return 0;
400400
}
401401

402-
static bool s3c64xx_spi_can_dma(struct spi_master *master,
402+
static bool s3c64xx_spi_can_dma(struct spi_controller *host,
403403
struct spi_device *spi,
404404
struct spi_transfer *xfer)
405405
{
406-
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
406+
struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(host);
407407

408408
if (sdd->rx_dma.ch && sdd->tx_dma.ch) {
409409
return xfer->len > (FIFO_LVL_MASK(sdd) >> 1) + 1;
@@ -712,10 +712,10 @@ static int s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd)
712712

713713
#define XFER_DMAADDR_INVALID DMA_BIT_MASK(32)
714714

715-
static int s3c64xx_spi_prepare_message(struct spi_master *master,
715+
static int s3c64xx_spi_prepare_message(struct spi_controller *host,
716716
struct spi_message *msg)
717717
{
718-
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
718+
struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(host);
719719
struct spi_device *spi = msg->spi;
720720
struct s3c64xx_spi_csinfo *cs = spi->controller_data;
721721

@@ -736,11 +736,11 @@ static size_t s3c64xx_spi_max_transfer_size(struct spi_device *spi)
736736
return ctlr->can_dma ? S3C64XX_SPI_PACKET_CNT_MASK : SIZE_MAX;
737737
}
738738

739-
static int s3c64xx_spi_transfer_one(struct spi_master *master,
739+
static int s3c64xx_spi_transfer_one(struct spi_controller *host,
740740
struct spi_device *spi,
741741
struct spi_transfer *xfer)
742742
{
743-
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
743+
struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(host);
744744
const unsigned int fifo_len = (FIFO_LVL_MASK(sdd) >> 1) + 1;
745745
const void *tx_buf = NULL;
746746
void *rx_buf = NULL;
@@ -890,15 +890,15 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master,
890890
return status;
891891
}
892892

893-
static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(
893+
static struct s3c64xx_spi_csinfo *s3c64xx_get_target_ctrldata(
894894
struct spi_device *spi)
895895
{
896896
struct s3c64xx_spi_csinfo *cs;
897-
struct device_node *slave_np, *data_np = NULL;
897+
struct device_node *target_np, *data_np = NULL;
898898
u32 fb_delay = 0;
899899

900-
slave_np = spi->dev.of_node;
901-
if (!slave_np) {
900+
target_np = spi->dev.of_node;
901+
if (!target_np) {
902902
dev_err(&spi->dev, "device node not found\n");
903903
return ERR_PTR(-EINVAL);
904904
}
@@ -907,7 +907,7 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(
907907
if (!cs)
908908
return ERR_PTR(-ENOMEM);
909909

910-
data_np = of_get_child_by_name(slave_np, "controller-data");
910+
data_np = of_get_child_by_name(target_np, "controller-data");
911911
if (!data_np) {
912912
dev_info(&spi->dev, "feedback delay set to default (0)\n");
913913
return cs;
@@ -932,9 +932,9 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
932932
int err;
933933
int div;
934934

935-
sdd = spi_master_get_devdata(spi->master);
935+
sdd = spi_controller_get_devdata(spi->controller);
936936
if (spi->dev.of_node) {
937-
cs = s3c64xx_get_slave_ctrldata(spi);
937+
cs = s3c64xx_get_target_ctrldata(spi);
938938
spi->controller_data = cs;
939939
}
940940

@@ -1022,7 +1022,7 @@ static void s3c64xx_spi_cleanup(struct spi_device *spi)
10221022
static irqreturn_t s3c64xx_spi_irq(int irq, void *data)
10231023
{
10241024
struct s3c64xx_spi_driver_data *sdd = data;
1025-
struct spi_master *spi = sdd->master;
1025+
struct spi_controller *spi = sdd->host;
10261026
unsigned int val, clr = 0;
10271027

10281028
val = readl(sdd->regs + S3C64XX_SPI_STATUS);
@@ -1151,7 +1151,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
11511151
struct resource *mem_res;
11521152
struct s3c64xx_spi_driver_data *sdd;
11531153
struct s3c64xx_spi_info *sci = dev_get_platdata(&pdev->dev);
1154-
struct spi_master *master;
1154+
struct spi_controller *host;
11551155
int ret, irq;
11561156
char clk_name[16];
11571157

@@ -1169,16 +1169,16 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
11691169
if (irq < 0)
11701170
return irq;
11711171

1172-
master = devm_spi_alloc_master(&pdev->dev, sizeof(*sdd));
1173-
if (!master)
1172+
host = devm_spi_alloc_host(&pdev->dev, sizeof(*sdd));
1173+
if (!host)
11741174
return dev_err_probe(&pdev->dev, -ENOMEM,
1175-
"Unable to allocate SPI Master\n");
1175+
"Unable to allocate SPI Host\n");
11761176

1177-
platform_set_drvdata(pdev, master);
1177+
platform_set_drvdata(pdev, host);
11781178

1179-
sdd = spi_master_get_devdata(master);
1179+
sdd = spi_controller_get_devdata(host);
11801180
sdd->port_conf = s3c64xx_spi_get_port_config(pdev);
1181-
sdd->master = master;
1181+
sdd->host = host;
11821182
sdd->cntrlr_info = sci;
11831183
sdd->pdev = pdev;
11841184
if (pdev->dev.of_node) {
@@ -1196,27 +1196,27 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
11961196
sdd->tx_dma.direction = DMA_MEM_TO_DEV;
11971197
sdd->rx_dma.direction = DMA_DEV_TO_MEM;
11981198

1199-
master->dev.of_node = pdev->dev.of_node;
1200-
master->bus_num = sdd->port_id;
1201-
master->setup = s3c64xx_spi_setup;
1202-
master->cleanup = s3c64xx_spi_cleanup;
1203-
master->prepare_transfer_hardware = s3c64xx_spi_prepare_transfer;
1204-
master->unprepare_transfer_hardware = s3c64xx_spi_unprepare_transfer;
1205-
master->prepare_message = s3c64xx_spi_prepare_message;
1206-
master->transfer_one = s3c64xx_spi_transfer_one;
1207-
master->max_transfer_size = s3c64xx_spi_max_transfer_size;
1208-
master->num_chipselect = sci->num_cs;
1209-
master->use_gpio_descriptors = true;
1210-
master->dma_alignment = 8;
1211-
master->bits_per_word_mask = SPI_BPW_MASK(32) | SPI_BPW_MASK(16) |
1212-
SPI_BPW_MASK(8);
1199+
host->dev.of_node = pdev->dev.of_node;
1200+
host->bus_num = sdd->port_id;
1201+
host->setup = s3c64xx_spi_setup;
1202+
host->cleanup = s3c64xx_spi_cleanup;
1203+
host->prepare_transfer_hardware = s3c64xx_spi_prepare_transfer;
1204+
host->unprepare_transfer_hardware = s3c64xx_spi_unprepare_transfer;
1205+
host->prepare_message = s3c64xx_spi_prepare_message;
1206+
host->transfer_one = s3c64xx_spi_transfer_one;
1207+
host->max_transfer_size = s3c64xx_spi_max_transfer_size;
1208+
host->num_chipselect = sci->num_cs;
1209+
host->use_gpio_descriptors = true;
1210+
host->dma_alignment = 8;
1211+
host->bits_per_word_mask = SPI_BPW_MASK(32) | SPI_BPW_MASK(16) |
1212+
SPI_BPW_MASK(8);
12131213
/* the spi->mode bits understood by this driver: */
1214-
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
1214+
host->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
12151215
if (sdd->port_conf->has_loopback)
1216-
master->mode_bits |= SPI_LOOP;
1217-
master->auto_runtime_pm = true;
1216+
host->mode_bits |= SPI_LOOP;
1217+
host->auto_runtime_pm = true;
12181218
if (!is_polling(sdd))
1219-
master->can_dma = s3c64xx_spi_can_dma;
1219+
host->can_dma = s3c64xx_spi_can_dma;
12201220

12211221
sdd->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &mem_res);
12221222
if (IS_ERR(sdd->regs))
@@ -1271,14 +1271,14 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
12711271
S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN,
12721272
sdd->regs + S3C64XX_SPI_INT_EN);
12731273

1274-
ret = devm_spi_register_master(&pdev->dev, master);
1274+
ret = devm_spi_register_controller(&pdev->dev, host);
12751275
if (ret != 0) {
1276-
dev_err(&pdev->dev, "cannot register SPI master: %d\n", ret);
1276+
dev_err(&pdev->dev, "cannot register SPI host: %d\n", ret);
12771277
goto err_pm_put;
12781278
}
12791279

1280-
dev_dbg(&pdev->dev, "Samsung SoC SPI Driver loaded for Bus SPI-%d with %d Slaves attached\n",
1281-
sdd->port_id, master->num_chipselect);
1280+
dev_dbg(&pdev->dev, "Samsung SoC SPI Driver loaded for Bus SPI-%d with %d Targets attached\n",
1281+
sdd->port_id, host->num_chipselect);
12821282
dev_dbg(&pdev->dev, "\tIOmem=[%pR]\tFIFO %dbytes\n",
12831283
mem_res, (FIFO_LVL_MASK(sdd) >> 1) + 1);
12841284

@@ -1297,8 +1297,8 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
12971297

12981298
static void s3c64xx_spi_remove(struct platform_device *pdev)
12991299
{
1300-
struct spi_master *master = platform_get_drvdata(pdev);
1301-
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
1300+
struct spi_controller *host = platform_get_drvdata(pdev);
1301+
struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(host);
13021302

13031303
pm_runtime_get_sync(&pdev->dev);
13041304

@@ -1317,10 +1317,10 @@ static void s3c64xx_spi_remove(struct platform_device *pdev)
13171317
#ifdef CONFIG_PM_SLEEP
13181318
static int s3c64xx_spi_suspend(struct device *dev)
13191319
{
1320-
struct spi_master *master = dev_get_drvdata(dev);
1321-
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
1320+
struct spi_controller *host = dev_get_drvdata(dev);
1321+
struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(host);
13221322

1323-
int ret = spi_master_suspend(master);
1323+
int ret = spi_controller_suspend(host);
13241324
if (ret)
13251325
return ret;
13261326

@@ -1335,8 +1335,8 @@ static int s3c64xx_spi_suspend(struct device *dev)
13351335

13361336
static int s3c64xx_spi_resume(struct device *dev)
13371337
{
1338-
struct spi_master *master = dev_get_drvdata(dev);
1339-
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
1338+
struct spi_controller *host = dev_get_drvdata(dev);
1339+
struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(host);
13401340
struct s3c64xx_spi_info *sci = sdd->cntrlr_info;
13411341
int ret;
13421342

@@ -1347,15 +1347,15 @@ static int s3c64xx_spi_resume(struct device *dev)
13471347
if (ret < 0)
13481348
return ret;
13491349

1350-
return spi_master_resume(master);
1350+
return spi_controller_resume(host);
13511351
}
13521352
#endif /* CONFIG_PM_SLEEP */
13531353

13541354
#ifdef CONFIG_PM
13551355
static int s3c64xx_spi_runtime_suspend(struct device *dev)
13561356
{
1357-
struct spi_master *master = dev_get_drvdata(dev);
1358-
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
1357+
struct spi_controller *host = dev_get_drvdata(dev);
1358+
struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(host);
13591359

13601360
clk_disable_unprepare(sdd->clk);
13611361
clk_disable_unprepare(sdd->src_clk);
@@ -1366,8 +1366,8 @@ static int s3c64xx_spi_runtime_suspend(struct device *dev)
13661366

13671367
static int s3c64xx_spi_runtime_resume(struct device *dev)
13681368
{
1369-
struct spi_master *master = dev_get_drvdata(dev);
1370-
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
1369+
struct spi_controller *host = dev_get_drvdata(dev);
1370+
struct s3c64xx_spi_driver_data *sdd = spi_controller_get_devdata(host);
13711371
int ret;
13721372

13731373
if (sdd->port_conf->clk_ioclk) {

0 commit comments

Comments
 (0)