Skip to content

Commit f9a7988

Browse files
brooniebroonie
committed
spi: switch to use modern name
Merge series from Yang Yingliang <yangyingliang@huawei.com>: After introducing devm_spi_alloc_host/spi_alloc_host(), the legacy named function devm_spi_alloc_master/spi_alloc_master() can be replaced. And also change other legacy name master/slave to modern name host/target or controller.
2 parents 0e19118 + 1f6c80a commit f9a7988

23 files changed

Lines changed: 624 additions & 624 deletions

‎drivers/spi/spi-amd.c‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,9 @@ static int amd_spi_execute_opcode(struct amd_spi *amd_spi)
215215
}
216216
}
217217

218-
static int amd_spi_master_setup(struct spi_device *spi)
218+
static int amd_spi_host_setup(struct spi_device *spi)
219219
{
220-
struct amd_spi *amd_spi = spi_master_get_devdata(spi->master);
220+
struct amd_spi *amd_spi = spi_controller_get_devdata(spi->controller);
221221

222222
amd_spi_clear_fifo_ptr(amd_spi);
223223

@@ -272,7 +272,7 @@ static int amd_set_spi_freq(struct amd_spi *amd_spi, u32 speed_hz)
272272
}
273273

274274
static inline int amd_spi_fifo_xfer(struct amd_spi *amd_spi,
275-
struct spi_master *master,
275+
struct spi_controller *host,
276276
struct spi_message *message)
277277
{
278278
struct spi_transfer *xfer = NULL;
@@ -353,15 +353,15 @@ static inline int amd_spi_fifo_xfer(struct amd_spi *amd_spi,
353353
return -ENODEV;
354354
}
355355

356-
spi_finalize_current_message(master);
356+
spi_finalize_current_message(host);
357357

358358
return message->status;
359359
}
360360

361-
static int amd_spi_master_transfer(struct spi_master *master,
361+
static int amd_spi_host_transfer(struct spi_controller *host,
362362
struct spi_message *msg)
363363
{
364-
struct amd_spi *amd_spi = spi_master_get_devdata(master);
364+
struct amd_spi *amd_spi = spi_controller_get_devdata(host);
365365
struct spi_device *spi = msg->spi;
366366

367367
amd_spi_select_chip(amd_spi, spi_get_chipselect(spi, 0));
@@ -370,7 +370,7 @@ static int amd_spi_master_transfer(struct spi_master *master,
370370
* Extract spi_transfers from the spi message and
371371
* program the controller.
372372
*/
373-
return amd_spi_fifo_xfer(amd_spi, master, msg);
373+
return amd_spi_fifo_xfer(amd_spi, host, msg);
374374
}
375375

376376
static size_t amd_spi_max_transfer_size(struct spi_device *spi)
@@ -381,16 +381,16 @@ static size_t amd_spi_max_transfer_size(struct spi_device *spi)
381381
static int amd_spi_probe(struct platform_device *pdev)
382382
{
383383
struct device *dev = &pdev->dev;
384-
struct spi_master *master;
384+
struct spi_controller *host;
385385
struct amd_spi *amd_spi;
386386
int err;
387387

388-
/* Allocate storage for spi_master and driver private data */
389-
master = devm_spi_alloc_master(dev, sizeof(struct amd_spi));
390-
if (!master)
391-
return dev_err_probe(dev, -ENOMEM, "Error allocating SPI master\n");
388+
/* Allocate storage for host and driver private data */
389+
host = devm_spi_alloc_host(dev, sizeof(struct amd_spi));
390+
if (!host)
391+
return dev_err_probe(dev, -ENOMEM, "Error allocating SPI host\n");
392392

393-
amd_spi = spi_master_get_devdata(master);
393+
amd_spi = spi_controller_get_devdata(host);
394394
amd_spi->io_remap_addr = devm_platform_ioremap_resource(pdev, 0);
395395
if (IS_ERR(amd_spi->io_remap_addr))
396396
return dev_err_probe(dev, PTR_ERR(amd_spi->io_remap_addr),
@@ -400,20 +400,20 @@ static int amd_spi_probe(struct platform_device *pdev)
400400

401401
amd_spi->version = (enum amd_spi_versions) device_get_match_data(dev);
402402

403-
/* Initialize the spi_master fields */
404-
master->bus_num = 0;
405-
master->num_chipselect = 4;
406-
master->mode_bits = 0;
407-
master->flags = SPI_CONTROLLER_HALF_DUPLEX;
408-
master->max_speed_hz = AMD_SPI_MAX_HZ;
409-
master->min_speed_hz = AMD_SPI_MIN_HZ;
410-
master->setup = amd_spi_master_setup;
411-
master->transfer_one_message = amd_spi_master_transfer;
412-
master->max_transfer_size = amd_spi_max_transfer_size;
413-
master->max_message_size = amd_spi_max_transfer_size;
403+
/* Initialize the spi_controller fields */
404+
host->bus_num = 0;
405+
host->num_chipselect = 4;
406+
host->mode_bits = 0;
407+
host->flags = SPI_CONTROLLER_HALF_DUPLEX;
408+
host->max_speed_hz = AMD_SPI_MAX_HZ;
409+
host->min_speed_hz = AMD_SPI_MIN_HZ;
410+
host->setup = amd_spi_host_setup;
411+
host->transfer_one_message = amd_spi_host_transfer;
412+
host->max_transfer_size = amd_spi_max_transfer_size;
413+
host->max_message_size = amd_spi_max_transfer_size;
414414

415415
/* Register the controller with SPI framework */
416-
err = devm_spi_register_master(dev, master);
416+
err = devm_spi_register_controller(dev, host);
417417
if (err)
418418
return dev_err_probe(dev, err, "error registering SPI controller\n");
419419

‎drivers/spi/spi-aspeed-smc.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ static const struct aspeed_spi_data ast2400_spi_data;
295295

296296
static int do_aspeed_spi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
297297
{
298-
struct aspeed_spi *aspi = spi_controller_get_devdata(mem->spi->master);
298+
struct aspeed_spi *aspi = spi_controller_get_devdata(mem->spi->controller);
299299
struct aspeed_spi_chip *chip = &aspi->chips[spi_get_chipselect(mem->spi, 0)];
300300
u32 addr_mode, addr_mode_backup;
301301
u32 ctl_val;
@@ -374,7 +374,7 @@ static int aspeed_spi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
374374

375375
static const char *aspeed_spi_get_name(struct spi_mem *mem)
376376
{
377-
struct aspeed_spi *aspi = spi_controller_get_devdata(mem->spi->master);
377+
struct aspeed_spi *aspi = spi_controller_get_devdata(mem->spi->controller);
378378
struct device *dev = aspi->dev;
379379

380380
return devm_kasprintf(dev, GFP_KERNEL, "%s.%d", dev_name(dev),
@@ -553,7 +553,7 @@ static int aspeed_spi_do_calibration(struct aspeed_spi_chip *chip);
553553

554554
static int aspeed_spi_dirmap_create(struct spi_mem_dirmap_desc *desc)
555555
{
556-
struct aspeed_spi *aspi = spi_controller_get_devdata(desc->mem->spi->master);
556+
struct aspeed_spi *aspi = spi_controller_get_devdata(desc->mem->spi->controller);
557557
struct aspeed_spi_chip *chip = &aspi->chips[spi_get_chipselect(desc->mem->spi, 0)];
558558
struct spi_mem_op *op = &desc->info.op_tmpl;
559559
u32 ctl_val;
@@ -620,7 +620,7 @@ static int aspeed_spi_dirmap_create(struct spi_mem_dirmap_desc *desc)
620620
static ssize_t aspeed_spi_dirmap_read(struct spi_mem_dirmap_desc *desc,
621621
u64 offset, size_t len, void *buf)
622622
{
623-
struct aspeed_spi *aspi = spi_controller_get_devdata(desc->mem->spi->master);
623+
struct aspeed_spi *aspi = spi_controller_get_devdata(desc->mem->spi->controller);
624624
struct aspeed_spi_chip *chip = &aspi->chips[spi_get_chipselect(desc->mem->spi, 0)];
625625

626626
/* Switch to USER command mode if mapping window is too small */
@@ -669,7 +669,7 @@ static void aspeed_spi_chip_enable(struct aspeed_spi *aspi, unsigned int cs, boo
669669

670670
static int aspeed_spi_setup(struct spi_device *spi)
671671
{
672-
struct aspeed_spi *aspi = spi_controller_get_devdata(spi->master);
672+
struct aspeed_spi *aspi = spi_controller_get_devdata(spi->controller);
673673
const struct aspeed_spi_data *data = aspi->data;
674674
unsigned int cs = spi_get_chipselect(spi, 0);
675675
struct aspeed_spi_chip *chip = &aspi->chips[cs];
@@ -697,7 +697,7 @@ static int aspeed_spi_setup(struct spi_device *spi)
697697

698698
static void aspeed_spi_cleanup(struct spi_device *spi)
699699
{
700-
struct aspeed_spi *aspi = spi_controller_get_devdata(spi->master);
700+
struct aspeed_spi *aspi = spi_controller_get_devdata(spi->controller);
701701
unsigned int cs = spi_get_chipselect(spi, 0);
702702

703703
aspeed_spi_chip_enable(aspi, cs, false);
@@ -726,7 +726,7 @@ static int aspeed_spi_probe(struct platform_device *pdev)
726726
if (!data)
727727
return -ENODEV;
728728

729-
ctlr = devm_spi_alloc_master(dev, sizeof(*aspi));
729+
ctlr = devm_spi_alloc_host(dev, sizeof(*aspi));
730730
if (!ctlr)
731731
return -ENOMEM;
732732

‎drivers/spi/spi-axi-spi-engine.c‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,8 @@ static bool spi_engine_read_rx_fifo(struct spi_engine *spi_engine)
356356

357357
static irqreturn_t spi_engine_irq(int irq, void *devid)
358358
{
359-
struct spi_master *master = devid;
360-
struct spi_engine *spi_engine = spi_master_get_devdata(master);
359+
struct spi_controller *host = devid;
360+
struct spi_engine *spi_engine = spi_controller_get_devdata(host);
361361
unsigned int disable_int = 0;
362362
unsigned int pending;
363363

@@ -396,7 +396,7 @@ static irqreturn_t spi_engine_irq(int irq, void *devid)
396396
msg->status = 0;
397397
msg->actual_length = msg->frame_length;
398398
spi_engine->msg = NULL;
399-
spi_finalize_current_message(master);
399+
spi_finalize_current_message(host);
400400
disable_int |= SPI_ENGINE_INT_SYNC;
401401
}
402402
}
@@ -412,11 +412,11 @@ static irqreturn_t spi_engine_irq(int irq, void *devid)
412412
return IRQ_HANDLED;
413413
}
414414

415-
static int spi_engine_transfer_one_message(struct spi_master *master,
415+
static int spi_engine_transfer_one_message(struct spi_controller *host,
416416
struct spi_message *msg)
417417
{
418418
struct spi_engine_program p_dry, *p;
419-
struct spi_engine *spi_engine = spi_master_get_devdata(master);
419+
struct spi_engine *spi_engine = spi_controller_get_devdata(host);
420420
unsigned int int_enable = 0;
421421
unsigned long flags;
422422
size_t size;
@@ -464,7 +464,7 @@ static int spi_engine_transfer_one_message(struct spi_master *master,
464464
static int spi_engine_probe(struct platform_device *pdev)
465465
{
466466
struct spi_engine *spi_engine;
467-
struct spi_master *master;
467+
struct spi_controller *host;
468468
unsigned int version;
469469
int irq;
470470
int ret;
@@ -477,29 +477,29 @@ static int spi_engine_probe(struct platform_device *pdev)
477477
if (!spi_engine)
478478
return -ENOMEM;
479479

480-
master = spi_alloc_master(&pdev->dev, 0);
481-
if (!master)
480+
host = spi_alloc_host(&pdev->dev, 0);
481+
if (!host)
482482
return -ENOMEM;
483483

484-
spi_master_set_devdata(master, spi_engine);
484+
spi_controller_set_devdata(host, spi_engine);
485485

486486
spin_lock_init(&spi_engine->lock);
487487

488488
spi_engine->clk = devm_clk_get(&pdev->dev, "s_axi_aclk");
489489
if (IS_ERR(spi_engine->clk)) {
490490
ret = PTR_ERR(spi_engine->clk);
491-
goto err_put_master;
491+
goto err_put_host;
492492
}
493493

494494
spi_engine->ref_clk = devm_clk_get(&pdev->dev, "spi_clk");
495495
if (IS_ERR(spi_engine->ref_clk)) {
496496
ret = PTR_ERR(spi_engine->ref_clk);
497-
goto err_put_master;
497+
goto err_put_host;
498498
}
499499

500500
ret = clk_prepare_enable(spi_engine->clk);
501501
if (ret)
502-
goto err_put_master;
502+
goto err_put_host;
503503

504504
ret = clk_prepare_enable(spi_engine->ref_clk);
505505
if (ret)
@@ -525,46 +525,46 @@ static int spi_engine_probe(struct platform_device *pdev)
525525
writel_relaxed(0xff, spi_engine->base + SPI_ENGINE_REG_INT_PENDING);
526526
writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_INT_ENABLE);
527527

528-
ret = request_irq(irq, spi_engine_irq, 0, pdev->name, master);
528+
ret = request_irq(irq, spi_engine_irq, 0, pdev->name, host);
529529
if (ret)
530530
goto err_ref_clk_disable;
531531

532-
master->dev.of_node = pdev->dev.of_node;
533-
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_3WIRE;
534-
master->bits_per_word_mask = SPI_BPW_MASK(8);
535-
master->max_speed_hz = clk_get_rate(spi_engine->ref_clk) / 2;
536-
master->transfer_one_message = spi_engine_transfer_one_message;
537-
master->num_chipselect = 8;
532+
host->dev.of_node = pdev->dev.of_node;
533+
host->mode_bits = SPI_CPOL | SPI_CPHA | SPI_3WIRE;
534+
host->bits_per_word_mask = SPI_BPW_MASK(8);
535+
host->max_speed_hz = clk_get_rate(spi_engine->ref_clk) / 2;
536+
host->transfer_one_message = spi_engine_transfer_one_message;
537+
host->num_chipselect = 8;
538538

539-
ret = spi_register_master(master);
539+
ret = spi_register_controller(host);
540540
if (ret)
541541
goto err_free_irq;
542542

543-
platform_set_drvdata(pdev, master);
543+
platform_set_drvdata(pdev, host);
544544

545545
return 0;
546546
err_free_irq:
547-
free_irq(irq, master);
547+
free_irq(irq, host);
548548
err_ref_clk_disable:
549549
clk_disable_unprepare(spi_engine->ref_clk);
550550
err_clk_disable:
551551
clk_disable_unprepare(spi_engine->clk);
552-
err_put_master:
553-
spi_master_put(master);
552+
err_put_host:
553+
spi_controller_put(host);
554554
return ret;
555555
}
556556

557557
static void spi_engine_remove(struct platform_device *pdev)
558558
{
559-
struct spi_master *master = spi_master_get(platform_get_drvdata(pdev));
560-
struct spi_engine *spi_engine = spi_master_get_devdata(master);
559+
struct spi_controller *host = spi_controller_get(platform_get_drvdata(pdev));
560+
struct spi_engine *spi_engine = spi_controller_get_devdata(host);
561561
int irq = platform_get_irq(pdev, 0);
562562

563-
spi_unregister_master(master);
563+
spi_unregister_controller(host);
564564

565-
free_irq(irq, master);
565+
free_irq(irq, host);
566566

567-
spi_master_put(master);
567+
spi_controller_put(host);
568568

569569
writel_relaxed(0xff, spi_engine->base + SPI_ENGINE_REG_INT_PENDING);
570570
writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_INT_ENABLE);

0 commit comments

Comments
 (0)