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

spi: atmel-quadspi: 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/20230110131805.2827248-4-yangyingliang@huawei.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 747d4e2c
...@@ -406,7 +406,7 @@ static int atmel_qspi_set_cfg(struct atmel_qspi *aq, ...@@ -406,7 +406,7 @@ static int atmel_qspi_set_cfg(struct atmel_qspi *aq,
static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
{ {
struct atmel_qspi *aq = spi_controller_get_devdata(mem->spi->master); struct atmel_qspi *aq = spi_controller_get_devdata(mem->spi->controller);
u32 sr, offset; u32 sr, offset;
int err; int err;
...@@ -476,7 +476,7 @@ static const struct spi_controller_mem_ops atmel_qspi_mem_ops = { ...@@ -476,7 +476,7 @@ static const struct spi_controller_mem_ops atmel_qspi_mem_ops = {
static int atmel_qspi_setup(struct spi_device *spi) static int atmel_qspi_setup(struct spi_device *spi)
{ {
struct spi_controller *ctrl = spi->master; struct spi_controller *ctrl = spi->controller;
struct atmel_qspi *aq = spi_controller_get_devdata(ctrl); struct atmel_qspi *aq = spi_controller_get_devdata(ctrl);
unsigned long src_rate; unsigned long src_rate;
u32 scbr; u32 scbr;
...@@ -512,7 +512,7 @@ static int atmel_qspi_setup(struct spi_device *spi) ...@@ -512,7 +512,7 @@ static int atmel_qspi_setup(struct spi_device *spi)
static int atmel_qspi_set_cs_timing(struct spi_device *spi) static int atmel_qspi_set_cs_timing(struct spi_device *spi)
{ {
struct spi_controller *ctrl = spi->master; struct spi_controller *ctrl = spi->controller;
struct atmel_qspi *aq = spi_controller_get_devdata(ctrl); struct atmel_qspi *aq = spi_controller_get_devdata(ctrl);
unsigned long clk_rate; unsigned long clk_rate;
u32 cs_setup; u32 cs_setup;
...@@ -582,7 +582,7 @@ static int atmel_qspi_probe(struct platform_device *pdev) ...@@ -582,7 +582,7 @@ static int atmel_qspi_probe(struct platform_device *pdev)
struct resource *res; struct resource *res;
int irq, err = 0; int irq, err = 0;
ctrl = devm_spi_alloc_master(&pdev->dev, sizeof(*aq)); ctrl = devm_spi_alloc_host(&pdev->dev, sizeof(*aq));
if (!ctrl) if (!ctrl)
return -ENOMEM; return -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