Unverified Commit 21ac58f5 authored by Yang Yingliang's avatar Yang Yingliang Committed by Mark Brown
Browse files

spi: aspeed: 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/20230728093221.3312026-3-yangyingliang@huawei.com


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

drivers/spi/spi-aspeed-smc.c

+7 −7
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static const struct aspeed_spi_data ast2400_spi_data; 


static int do_aspeed_spi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)

{

	struct aspeed_spi *aspi = spi_controller_get_devdata(mem->spi->master);

	struct aspeed_spi *aspi = spi_controller_get_devdata(mem->spi->controller);

	struct aspeed_spi_chip *chip = &aspi->chips[spi_get_chipselect(mem->spi, 0)];

	u32 addr_mode, addr_mode_backup;

	u32 ctl_val;
@@ -374,7 +374,7 @@ static int aspeed_spi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) 


static const char *aspeed_spi_get_name(struct spi_mem *mem)

{

	struct aspeed_spi *aspi = spi_controller_get_devdata(mem->spi->master);

	struct aspeed_spi *aspi = spi_controller_get_devdata(mem->spi->controller);

	struct device *dev = aspi->dev;



	return devm_kasprintf(dev, GFP_KERNEL, "%s.%d", dev_name(dev),
@@ -553,7 +553,7 @@ static int aspeed_spi_do_calibration(struct aspeed_spi_chip *chip); 


static int aspeed_spi_dirmap_create(struct spi_mem_dirmap_desc *desc)

{

	struct aspeed_spi *aspi = spi_controller_get_devdata(desc->mem->spi->master);

	struct aspeed_spi *aspi = spi_controller_get_devdata(desc->mem->spi->controller);

	struct aspeed_spi_chip *chip = &aspi->chips[spi_get_chipselect(desc->mem->spi, 0)];

	struct spi_mem_op *op = &desc->info.op_tmpl;

	u32 ctl_val;
@@ -620,7 +620,7 @@ static int aspeed_spi_dirmap_create(struct spi_mem_dirmap_desc *desc) 
static ssize_t aspeed_spi_dirmap_read(struct spi_mem_dirmap_desc *desc,

				      u64 offset, size_t len, void *buf)

{

	struct aspeed_spi *aspi = spi_controller_get_devdata(desc->mem->spi->master);

	struct aspeed_spi *aspi = spi_controller_get_devdata(desc->mem->spi->controller);

	struct aspeed_spi_chip *chip = &aspi->chips[spi_get_chipselect(desc->mem->spi, 0)];



	/* Switch to USER command mode if mapping window is too small */
@@ -669,7 +669,7 @@ static void aspeed_spi_chip_enable(struct aspeed_spi *aspi, unsigned int cs, boo 


static int aspeed_spi_setup(struct spi_device *spi)

{

	struct aspeed_spi *aspi = spi_controller_get_devdata(spi->master);

	struct aspeed_spi *aspi = spi_controller_get_devdata(spi->controller);

	const struct aspeed_spi_data *data = aspi->data;

	unsigned int cs = spi_get_chipselect(spi, 0);

	struct aspeed_spi_chip *chip = &aspi->chips[cs];
@@ -697,7 +697,7 @@ static int aspeed_spi_setup(struct spi_device *spi) 


static void aspeed_spi_cleanup(struct spi_device *spi)

{

	struct aspeed_spi *aspi = spi_controller_get_devdata(spi->master);

	struct aspeed_spi *aspi = spi_controller_get_devdata(spi->controller);

	unsigned int cs = spi_get_chipselect(spi, 0);



	aspeed_spi_chip_enable(aspi, cs, false);
@@ -726,7 +726,7 @@ static int aspeed_spi_probe(struct platform_device *pdev) 
	if (!data)

		return -ENODEV;



	ctlr = devm_spi_alloc_master(dev, sizeof(*aspi));

	ctlr = devm_spi_alloc_host(dev, sizeof(*aspi));

	if (!ctlr)

		return -ENOMEM;