diff options
author | Yang Yingliang <yangyingliang@huawei.com> | 2023-08-07 20:40:57 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2023-08-14 13:10:58 +0100 |
commit | 6588d43ae8e3046996b315cc6dcb2a7e0c2bb547 (patch) | |
tree | 7e956404347c5ef46cd1e514d43a0196517ba030 /drivers/spi/spi-gxp.c | |
parent | 20becf43e8ca3a9ff00ed24e19695347e0a2f0e7 (diff) | |
download | lwn-6588d43ae8e3046996b315cc6dcb2a7e0c2bb547.tar.gz lwn-6588d43ae8e3046996b315cc6dcb2a7e0c2bb547.zip |
spi: gxp: switch to use modern name
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/20230807124105.3429709-13-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-gxp.c')
-rw-r--r-- | drivers/spi/spi-gxp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-gxp.c b/drivers/spi/spi-gxp.c index 88ab3032736b..fd2fac236bbd 100644 --- a/drivers/spi/spi-gxp.c +++ b/drivers/spi/spi-gxp.c @@ -199,7 +199,7 @@ static ssize_t gxp_spi_write(struct gxp_spi_chip *chip, const struct spi_mem_op static int do_gxp_exec_mem_op(struct spi_mem *mem, const struct spi_mem_op *op) { - struct gxp_spi *spifi = spi_controller_get_devdata(mem->spi->master); + struct gxp_spi *spifi = spi_controller_get_devdata(mem->spi->controller); struct gxp_spi_chip *chip = &spifi->chips[spi_get_chipselect(mem->spi, 0)]; int ret; @@ -235,7 +235,7 @@ static const struct spi_controller_mem_ops gxp_spi_mem_ops = { static int gxp_spi_setup(struct spi_device *spi) { - struct gxp_spi *spifi = spi_controller_get_devdata(spi->master); + struct gxp_spi *spifi = spi_controller_get_devdata(spi->controller); unsigned int cs = spi_get_chipselect(spi, 0); struct gxp_spi_chip *chip = &spifi->chips[cs]; @@ -257,7 +257,7 @@ static int gxp_spifi_probe(struct platform_device *pdev) data = of_device_get_match_data(&pdev->dev); - ctlr = devm_spi_alloc_master(dev, sizeof(*spifi)); + ctlr = devm_spi_alloc_host(dev, sizeof(*spifi)); if (!ctlr) return -ENOMEM; |