shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

spi: atmel-quadspi: switch to use modern name

Browse Source 
[ Upstream commit ccbc6554ed ]

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/20230110131805.2827248-4-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: be92ab2de0ee ("spi: atmel-qspi: Memory barriers after memory-mapped I/O")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yang Yingliang
2023-01-10 21:18:05 +08:00
committed by Greg Kroah-Hartman
parent baaad6765a
commit 756bb7c73f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/spi/atmel-quadspi.c
View File

@@ -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 = {
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)
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)
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;