Commit 87384599 authored by Yang Yingliang's avatar Yang Yingliang Committed by Mark Brown

spi: ar934x: 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/20221230092806.1687340-4-yangyingliang@huawei.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 90ce7e7a
...@@ -61,7 +61,7 @@ static inline int ar934x_spi_clk_div(struct ar934x_spi *sp, unsigned int freq) ...@@ -61,7 +61,7 @@ static inline int ar934x_spi_clk_div(struct ar934x_spi *sp, unsigned int freq)
static int ar934x_spi_setup(struct spi_device *spi) static int ar934x_spi_setup(struct spi_device *spi)
{ {
struct ar934x_spi *sp = spi_controller_get_devdata(spi->master); struct ar934x_spi *sp = spi_controller_get_devdata(spi->controller);
if ((spi->max_speed_hz == 0) || if ((spi->max_speed_hz == 0) ||
(spi->max_speed_hz > (sp->clk_freq / 2))) { (spi->max_speed_hz > (sp->clk_freq / 2))) {
...@@ -74,10 +74,10 @@ static int ar934x_spi_setup(struct spi_device *spi) ...@@ -74,10 +74,10 @@ static int ar934x_spi_setup(struct spi_device *spi)
return 0; return 0;
} }
static int ar934x_spi_transfer_one_message(struct spi_controller *master, static int ar934x_spi_transfer_one_message(struct spi_controller *ctlr,
struct spi_message *m) struct spi_message *m)
{ {
struct ar934x_spi *sp = spi_controller_get_devdata(master); struct ar934x_spi *sp = spi_controller_get_devdata(ctlr);
struct spi_transfer *t = NULL; struct spi_transfer *t = NULL;
struct spi_device *spi = m->spi; struct spi_device *spi = m->spi;
unsigned long trx_done, trx_cur; unsigned long trx_done, trx_cur;
...@@ -150,7 +150,7 @@ static int ar934x_spi_transfer_one_message(struct spi_controller *master, ...@@ -150,7 +150,7 @@ static int ar934x_spi_transfer_one_message(struct spi_controller *master,
msg_done: msg_done:
m->status = stat; m->status = stat;
spi_finalize_current_message(master); spi_finalize_current_message(ctlr);
return 0; return 0;
} }
...@@ -183,7 +183,7 @@ static int ar934x_spi_probe(struct platform_device *pdev) ...@@ -183,7 +183,7 @@ static int ar934x_spi_probe(struct platform_device *pdev)
if (ret) if (ret)
return ret; return ret;
ctlr = devm_spi_alloc_master(&pdev->dev, sizeof(*sp)); ctlr = devm_spi_alloc_host(&pdev->dev, sizeof(*sp));
if (!ctlr) { if (!ctlr) {
dev_info(&pdev->dev, "failed to allocate spi controller\n"); dev_info(&pdev->dev, "failed to allocate spi controller\n");
ret = -ENOMEM; ret = -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment