Skip to content

Commit fc42bb5

Browse files
Yang Yingliangbroonie
Yang Yingliang
authored and
broonie
committed
spi: mxic: 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://lore.kernel.org/r/20230823033003.3407403-16-yangyingliang@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 0fc8a1a commit fc42bb5

1 file changed

Lines changed: 34 additions & 34 deletions

File tree

‎drivers/spi/spi-mxic.c‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ static int mxic_spi_data_xfer(struct mxic_spi *mxic, const void *txbuf,
390390
static ssize_t mxic_spi_mem_dirmap_read(struct spi_mem_dirmap_desc *desc,
391391
u64 offs, size_t len, void *buf)
392392
{
393-
struct mxic_spi *mxic = spi_master_get_devdata(desc->mem->spi->master);
393+
struct mxic_spi *mxic = spi_controller_get_devdata(desc->mem->spi->controller);
394394
int ret;
395395
u32 sts;
396396

@@ -434,7 +434,7 @@ static ssize_t mxic_spi_mem_dirmap_write(struct spi_mem_dirmap_desc *desc,
434434
u64 offs, size_t len,
435435
const void *buf)
436436
{
437-
struct mxic_spi *mxic = spi_master_get_devdata(desc->mem->spi->master);
437+
struct mxic_spi *mxic = spi_controller_get_devdata(desc->mem->spi->controller);
438438
u32 sts;
439439
int ret;
440440

@@ -493,7 +493,7 @@ static bool mxic_spi_mem_supports_op(struct spi_mem *mem,
493493

494494
static int mxic_spi_mem_dirmap_create(struct spi_mem_dirmap_desc *desc)
495495
{
496-
struct mxic_spi *mxic = spi_master_get_devdata(desc->mem->spi->master);
496+
struct mxic_spi *mxic = spi_controller_get_devdata(desc->mem->spi->controller);
497497

498498
if (!mxic->linear.map)
499499
return -EINVAL;
@@ -510,7 +510,7 @@ static int mxic_spi_mem_dirmap_create(struct spi_mem_dirmap_desc *desc)
510510
static int mxic_spi_mem_exec_op(struct spi_mem *mem,
511511
const struct spi_mem_op *op)
512512
{
513-
struct mxic_spi *mxic = spi_master_get_devdata(mem->spi->master);
513+
struct mxic_spi *mxic = spi_controller_get_devdata(mem->spi->controller);
514514
int i, ret;
515515
u8 addr[8], cmd[2];
516516

@@ -577,7 +577,7 @@ static const struct spi_controller_mem_caps mxic_spi_mem_caps = {
577577

578578
static void mxic_spi_set_cs(struct spi_device *spi, bool lvl)
579579
{
580-
struct mxic_spi *mxic = spi_master_get_devdata(spi->master);
580+
struct mxic_spi *mxic = spi_controller_get_devdata(spi->controller);
581581

582582
if (!lvl) {
583583
writel(readl(mxic->regs + HC_CFG) | HC_CFG_MAN_CS_EN,
@@ -592,11 +592,11 @@ static void mxic_spi_set_cs(struct spi_device *spi, bool lvl)
592592
}
593593
}
594594

595-
static int mxic_spi_transfer_one(struct spi_master *master,
595+
static int mxic_spi_transfer_one(struct spi_controller *host,
596596
struct spi_device *spi,
597597
struct spi_transfer *t)
598598
{
599-
struct mxic_spi *mxic = spi_master_get_devdata(master);
599+
struct mxic_spi *mxic = spi_controller_get_devdata(host);
600600
unsigned int busw = OP_BUSW_1;
601601
int ret;
602602

@@ -632,7 +632,7 @@ static int mxic_spi_transfer_one(struct spi_master *master,
632632
if (ret)
633633
return ret;
634634

635-
spi_finalize_current_transfer(master);
635+
spi_finalize_current_transfer(host);
636636

637637
return 0;
638638
}
@@ -713,8 +713,8 @@ static int mxic_spi_mem_ecc_probe(struct platform_device *pdev,
713713

714714
static int __maybe_unused mxic_spi_runtime_suspend(struct device *dev)
715715
{
716-
struct spi_master *master = dev_get_drvdata(dev);
717-
struct mxic_spi *mxic = spi_master_get_devdata(master);
716+
struct spi_controller *host = dev_get_drvdata(dev);
717+
struct mxic_spi *mxic = spi_controller_get_devdata(host);
718718

719719
mxic_spi_clk_disable(mxic);
720720
clk_disable_unprepare(mxic->ps_clk);
@@ -724,8 +724,8 @@ static int __maybe_unused mxic_spi_runtime_suspend(struct device *dev)
724724

725725
static int __maybe_unused mxic_spi_runtime_resume(struct device *dev)
726726
{
727-
struct spi_master *master = dev_get_drvdata(dev);
728-
struct mxic_spi *mxic = spi_master_get_devdata(master);
727+
struct spi_controller *host = dev_get_drvdata(dev);
728+
struct mxic_spi *mxic = spi_controller_get_devdata(host);
729729
int ret;
730730

731731
ret = clk_prepare_enable(mxic->ps_clk);
@@ -744,21 +744,21 @@ static const struct dev_pm_ops mxic_spi_dev_pm_ops = {
744744

745745
static int mxic_spi_probe(struct platform_device *pdev)
746746
{
747-
struct spi_master *master;
747+
struct spi_controller *host;
748748
struct resource *res;
749749
struct mxic_spi *mxic;
750750
int ret;
751751

752-
master = devm_spi_alloc_master(&pdev->dev, sizeof(struct mxic_spi));
753-
if (!master)
752+
host = devm_spi_alloc_host(&pdev->dev, sizeof(struct mxic_spi));
753+
if (!host)
754754
return -ENOMEM;
755755

756-
platform_set_drvdata(pdev, master);
756+
platform_set_drvdata(pdev, host);
757757

758-
mxic = spi_master_get_devdata(master);
758+
mxic = spi_controller_get_devdata(host);
759759
mxic->dev = &pdev->dev;
760760

761-
master->dev.of_node = pdev->dev.of_node;
761+
host->dev.of_node = pdev->dev.of_node;
762762

763763
mxic->ps_clk = devm_clk_get(&pdev->dev, "ps_clk");
764764
if (IS_ERR(mxic->ps_clk))
@@ -786,19 +786,19 @@ static int mxic_spi_probe(struct platform_device *pdev)
786786
}
787787

788788
pm_runtime_enable(&pdev->dev);
789-
master->auto_runtime_pm = true;
789+
host->auto_runtime_pm = true;
790790

791-
master->num_chipselect = 1;
792-
master->mem_ops = &mxic_spi_mem_ops;
793-
master->mem_caps = &mxic_spi_mem_caps;
791+
host->num_chipselect = 1;
792+
host->mem_ops = &mxic_spi_mem_ops;
793+
host->mem_caps = &mxic_spi_mem_caps;
794794

795-
master->set_cs = mxic_spi_set_cs;
796-
master->transfer_one = mxic_spi_transfer_one;
797-
master->bits_per_word_mask = SPI_BPW_MASK(8);
798-
master->mode_bits = SPI_CPOL | SPI_CPHA |
799-
SPI_RX_DUAL | SPI_TX_DUAL |
800-
SPI_RX_QUAD | SPI_TX_QUAD |
801-
SPI_RX_OCTAL | SPI_TX_OCTAL;
795+
host->set_cs = mxic_spi_set_cs;
796+
host->transfer_one = mxic_spi_transfer_one;
797+
host->bits_per_word_mask = SPI_BPW_MASK(8);
798+
host->mode_bits = SPI_CPOL | SPI_CPHA |
799+
SPI_RX_DUAL | SPI_TX_DUAL |
800+
SPI_RX_QUAD | SPI_TX_QUAD |
801+
SPI_RX_OCTAL | SPI_TX_OCTAL;
802802

803803
mxic_spi_hw_init(mxic);
804804

@@ -808,9 +808,9 @@ static int mxic_spi_probe(struct platform_device *pdev)
808808
return ret;
809809
}
810810

811-
ret = spi_register_master(master);
811+
ret = spi_register_controller(host);
812812
if (ret) {
813-
dev_err(&pdev->dev, "spi_register_master failed\n");
813+
dev_err(&pdev->dev, "spi_register_controller failed\n");
814814
pm_runtime_disable(&pdev->dev);
815815
mxic_spi_mem_ecc_remove(mxic);
816816
}
@@ -820,12 +820,12 @@ static int mxic_spi_probe(struct platform_device *pdev)
820820

821821
static void mxic_spi_remove(struct platform_device *pdev)
822822
{
823-
struct spi_master *master = platform_get_drvdata(pdev);
824-
struct mxic_spi *mxic = spi_master_get_devdata(master);
823+
struct spi_controller *host = platform_get_drvdata(pdev);
824+
struct mxic_spi *mxic = spi_controller_get_devdata(host);
825825

826826
pm_runtime_disable(&pdev->dev);
827827
mxic_spi_mem_ecc_remove(mxic);
828-
spi_unregister_master(master);
828+
spi_unregister_controller(host);
829829
}
830830

831831
static const struct of_device_id mxic_spi_of_ids[] = {

0 commit comments

Comments
 (0)