Unverified Commit fc42bb55 authored by Yang Yingliang's avatar Yang Yingliang Committed by Mark Brown
Browse files

spi: mxic: switch to use modern name 



Change legacy name master to modern name host or controller.

No functional changed.

Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20230823033003.3407403-16-yangyingliang@huawei.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0fc8a1a4

drivers/spi/spi-mxic.c

+34 −34
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static int mxic_spi_data_xfer(struct mxic_spi *mxic, const void *txbuf, 
static ssize_t mxic_spi_mem_dirmap_read(struct spi_mem_dirmap_desc *desc,

					u64 offs, size_t len, void *buf)

{

	struct mxic_spi *mxic = spi_master_get_devdata(desc->mem->spi->master);

	struct mxic_spi *mxic = spi_controller_get_devdata(desc->mem->spi->controller);

	int ret;

	u32 sts;
@@ -434,7 +434,7 @@ static ssize_t mxic_spi_mem_dirmap_write(struct spi_mem_dirmap_desc *desc, 
					 u64 offs, size_t len,

					 const void *buf)

{

	struct mxic_spi *mxic = spi_master_get_devdata(desc->mem->spi->master);

	struct mxic_spi *mxic = spi_controller_get_devdata(desc->mem->spi->controller);

	u32 sts;

	int ret;
@@ -493,7 +493,7 @@ static bool mxic_spi_mem_supports_op(struct spi_mem *mem, 


static int mxic_spi_mem_dirmap_create(struct spi_mem_dirmap_desc *desc)

{

	struct mxic_spi *mxic = spi_master_get_devdata(desc->mem->spi->master);

	struct mxic_spi *mxic = spi_controller_get_devdata(desc->mem->spi->controller);



	if (!mxic->linear.map)

		return -EINVAL;
@@ -510,7 +510,7 @@ static int mxic_spi_mem_dirmap_create(struct spi_mem_dirmap_desc *desc) 
static int mxic_spi_mem_exec_op(struct spi_mem *mem,

				const struct spi_mem_op *op)

{

	struct mxic_spi *mxic = spi_master_get_devdata(mem->spi->master);

	struct mxic_spi *mxic = spi_controller_get_devdata(mem->spi->controller);

	int i, ret;

	u8 addr[8], cmd[2];
@@ -577,7 +577,7 @@ static const struct spi_controller_mem_caps mxic_spi_mem_caps = { 


static void mxic_spi_set_cs(struct spi_device *spi, bool lvl)

{

	struct mxic_spi *mxic = spi_master_get_devdata(spi->master);

	struct mxic_spi *mxic = spi_controller_get_devdata(spi->controller);



	if (!lvl) {

		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) 
	}

}



static int mxic_spi_transfer_one(struct spi_master *master,

static int mxic_spi_transfer_one(struct spi_controller *host,

				 struct spi_device *spi,

				 struct spi_transfer *t)

{

	struct mxic_spi *mxic = spi_master_get_devdata(master);

	struct mxic_spi *mxic = spi_controller_get_devdata(host);

	unsigned int busw = OP_BUSW_1;

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

		return ret;



	spi_finalize_current_transfer(master);

	spi_finalize_current_transfer(host);



	return 0;

}
@@ -713,8 +713,8 @@ static int mxic_spi_mem_ecc_probe(struct platform_device *pdev, 


static int __maybe_unused mxic_spi_runtime_suspend(struct device *dev)

{

	struct spi_master *master = dev_get_drvdata(dev);

	struct mxic_spi *mxic = spi_master_get_devdata(master);

	struct spi_controller *host = dev_get_drvdata(dev);

	struct mxic_spi *mxic = spi_controller_get_devdata(host);



	mxic_spi_clk_disable(mxic);

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


static int __maybe_unused mxic_spi_runtime_resume(struct device *dev)

{

	struct spi_master *master = dev_get_drvdata(dev);

	struct mxic_spi *mxic = spi_master_get_devdata(master);

	struct spi_controller *host = dev_get_drvdata(dev);

	struct mxic_spi *mxic = spi_controller_get_devdata(host);

	int ret;



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


static int mxic_spi_probe(struct platform_device *pdev)

{

	struct spi_master *master;

	struct spi_controller *host;

	struct resource *res;

	struct mxic_spi *mxic;

	int ret;



	master = devm_spi_alloc_master(&pdev->dev, sizeof(struct mxic_spi));

	if (!master)

	host = devm_spi_alloc_host(&pdev->dev, sizeof(struct mxic_spi));

	if (!host)

		return -ENOMEM;



	platform_set_drvdata(pdev, master);

	platform_set_drvdata(pdev, host);



	mxic = spi_master_get_devdata(master);

	mxic = spi_controller_get_devdata(host);

	mxic->dev = &pdev->dev;



	master->dev.of_node = pdev->dev.of_node;

	host->dev.of_node = pdev->dev.of_node;



	mxic->ps_clk = devm_clk_get(&pdev->dev, "ps_clk");

	if (IS_ERR(mxic->ps_clk))
@@ -786,16 +786,16 @@ static int mxic_spi_probe(struct platform_device *pdev) 
	}



	pm_runtime_enable(&pdev->dev);

	master->auto_runtime_pm = true;

	host->auto_runtime_pm = true;



	master->num_chipselect = 1;

	master->mem_ops = &mxic_spi_mem_ops;

	master->mem_caps = &mxic_spi_mem_caps;

	host->num_chipselect = 1;

	host->mem_ops = &mxic_spi_mem_ops;

	host->mem_caps = &mxic_spi_mem_caps;



	master->set_cs = mxic_spi_set_cs;

	master->transfer_one = mxic_spi_transfer_one;

	master->bits_per_word_mask = SPI_BPW_MASK(8);

	master->mode_bits = SPI_CPOL | SPI_CPHA |

	host->set_cs = mxic_spi_set_cs;

	host->transfer_one = mxic_spi_transfer_one;

	host->bits_per_word_mask = SPI_BPW_MASK(8);

	host->mode_bits = SPI_CPOL | SPI_CPHA |

			  SPI_RX_DUAL | SPI_TX_DUAL |

			  SPI_RX_QUAD | SPI_TX_QUAD |

			  SPI_RX_OCTAL | SPI_TX_OCTAL;
@@ -808,9 +808,9 @@ static int mxic_spi_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = spi_register_master(master);

	ret = spi_register_controller(host);

	if (ret) {

		dev_err(&pdev->dev, "spi_register_master failed\n");

		dev_err(&pdev->dev, "spi_register_controller failed\n");

		pm_runtime_disable(&pdev->dev);

		mxic_spi_mem_ecc_remove(mxic);

	}
@@ -820,12 +820,12 @@ static int mxic_spi_probe(struct platform_device *pdev) 


static void mxic_spi_remove(struct platform_device *pdev)

{

	struct spi_master *master = platform_get_drvdata(pdev);

	struct mxic_spi *mxic = spi_master_get_devdata(master);

	struct spi_controller *host = platform_get_drvdata(pdev);

	struct mxic_spi *mxic = spi_controller_get_devdata(host);



	pm_runtime_disable(&pdev->dev);

	mxic_spi_mem_ecc_remove(mxic);

	spi_unregister_master(master);

	spi_unregister_controller(host);

}



static const struct of_device_id mxic_spi_of_ids[] = {