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

spi: npcm-pspi: 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-18-yangyingliang@huawei.com


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

drivers/spi/spi-npcm-pspi.c

+34 −34
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
struct npcm_pspi {

	struct completion xfer_done;

	struct reset_control *reset;

	struct spi_master *master;

	struct spi_controller *host;

	unsigned int tx_bytes;

	unsigned int rx_bytes;

	void __iomem *base;
@@ -101,7 +101,7 @@ static inline void npcm_pspi_disable(struct npcm_pspi *priv) 


static void npcm_pspi_set_mode(struct spi_device *spi)

{

	struct npcm_pspi *priv = spi_master_get_devdata(spi->master);

	struct npcm_pspi *priv = spi_controller_get_devdata(spi->controller);

	u16 regtemp;

	u16 mode_val;
@@ -159,7 +159,7 @@ static void npcm_pspi_set_baudrate(struct npcm_pspi *priv, unsigned int speed) 
static void npcm_pspi_setup_transfer(struct spi_device *spi,

				     struct spi_transfer *t)

{

	struct npcm_pspi *priv = spi_master_get_devdata(spi->master);

	struct npcm_pspi *priv = spi_controller_get_devdata(spi->controller);



	priv->tx_buf = t->tx_buf;

	priv->rx_buf = t->rx_buf;
@@ -245,11 +245,11 @@ static void npcm_pspi_recv(struct npcm_pspi *priv) 
	}

}



static int npcm_pspi_transfer_one(struct spi_master *master,

static int npcm_pspi_transfer_one(struct spi_controller *host,

				  struct spi_device *spi,

				  struct spi_transfer *t)

{

	struct npcm_pspi *priv = spi_master_get_devdata(master);

	struct npcm_pspi *priv = spi_controller_get_devdata(host);

	int status;



	npcm_pspi_setup_transfer(spi, t);
@@ -266,18 +266,18 @@ static int npcm_pspi_transfer_one(struct spi_master *master, 
	return 0;

}



static int npcm_pspi_prepare_transfer_hardware(struct spi_master *master)

static int npcm_pspi_prepare_transfer_hardware(struct spi_controller *host)

{

	struct npcm_pspi *priv = spi_master_get_devdata(master);

	struct npcm_pspi *priv = spi_controller_get_devdata(host);



	npcm_pspi_irq_enable(priv, NPCM_PSPI_CTL1_EIR | NPCM_PSPI_CTL1_EIW);



	return 0;

}



static int npcm_pspi_unprepare_transfer_hardware(struct spi_master *master)

static int npcm_pspi_unprepare_transfer_hardware(struct spi_controller *host)

{

	struct npcm_pspi *priv = spi_master_get_devdata(master);

	struct npcm_pspi *priv = spi_controller_get_devdata(host);



	npcm_pspi_irq_disable(priv, NPCM_PSPI_CTL1_EIR | NPCM_PSPI_CTL1_EIW);
@@ -340,37 +340,37 @@ static irqreturn_t npcm_pspi_handler(int irq, void *dev_id) 
static int npcm_pspi_probe(struct platform_device *pdev)

{

	struct npcm_pspi *priv;

	struct spi_master *master;

	struct spi_controller *host;

	unsigned long clk_hz;

	int irq;

	int ret;



	master = spi_alloc_master(&pdev->dev, sizeof(*priv));

	if (!master)

	host = spi_alloc_host(&pdev->dev, sizeof(*priv));

	if (!host)

		return -ENOMEM;



	platform_set_drvdata(pdev, master);

	platform_set_drvdata(pdev, host);



	priv = spi_master_get_devdata(master);

	priv->master = master;

	priv = spi_controller_get_devdata(host);

	priv->host = host;

	priv->is_save_param = false;



	priv->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(priv->base)) {

		ret = PTR_ERR(priv->base);

		goto out_master_put;

		goto out_host_put;

	}



	priv->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(priv->clk)) {

		dev_err(&pdev->dev, "failed to get clock\n");

		ret = PTR_ERR(priv->clk);

		goto out_master_put;

		goto out_host_put;

	}



	ret = clk_prepare_enable(priv->clk);

	if (ret)

		goto out_master_put;

		goto out_host_put;



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {
@@ -398,42 +398,42 @@ static int npcm_pspi_probe(struct platform_device *pdev) 


	clk_hz = clk_get_rate(priv->clk);



	master->max_speed_hz = DIV_ROUND_UP(clk_hz, NPCM_PSPI_MIN_CLK_DIVIDER);

	master->min_speed_hz = DIV_ROUND_UP(clk_hz, NPCM_PSPI_MAX_CLK_DIVIDER);

	master->mode_bits = SPI_CPHA | SPI_CPOL;

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

	master->bus_num = -1;

	master->bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(16);

	master->transfer_one = npcm_pspi_transfer_one;

	master->prepare_transfer_hardware =

	host->max_speed_hz = DIV_ROUND_UP(clk_hz, NPCM_PSPI_MIN_CLK_DIVIDER);

	host->min_speed_hz = DIV_ROUND_UP(clk_hz, NPCM_PSPI_MAX_CLK_DIVIDER);

	host->mode_bits = SPI_CPHA | SPI_CPOL;

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

	host->bus_num = -1;

	host->bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(16);

	host->transfer_one = npcm_pspi_transfer_one;

	host->prepare_transfer_hardware =

		npcm_pspi_prepare_transfer_hardware;

	master->unprepare_transfer_hardware =

	host->unprepare_transfer_hardware =

		npcm_pspi_unprepare_transfer_hardware;

	master->use_gpio_descriptors = true;

	host->use_gpio_descriptors = true;



	/* set to default clock rate */

	npcm_pspi_set_baudrate(priv, NPCM_PSPI_DEFAULT_CLK);



	ret = devm_spi_register_master(&pdev->dev, master);

	ret = devm_spi_register_controller(&pdev->dev, host);

	if (ret)

		goto out_disable_clk;



	pr_info("NPCM Peripheral SPI %d probed\n", master->bus_num);

	pr_info("NPCM Peripheral SPI %d probed\n", host->bus_num);



	return 0;



out_disable_clk:

	clk_disable_unprepare(priv->clk);



out_master_put:

	spi_master_put(master);

out_host_put:

	spi_controller_put(host);

	return ret;

}



static void npcm_pspi_remove(struct platform_device *pdev)

{

	struct spi_master *master = platform_get_drvdata(pdev);

	struct npcm_pspi *priv = spi_master_get_devdata(master);

	struct spi_controller *host = platform_get_drvdata(pdev);

	struct npcm_pspi *priv = spi_controller_get_devdata(host);



	npcm_pspi_reset_hw(priv);

	clk_disable_unprepare(priv->clk);