From 31e3fe5faac66b8e0cd089a170930f2d6c31f0d2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Jul 2024 10:02:54 +0000 Subject: [PATCH] Revert "spi: spi-axi-spi-engine: switch to use modern name" This reverts commit d8309051f71b84fa8771a4adfa155c560cf52876 which is commit 9d5920b37ab4a970f658a6a30b54cc6d6a7d2d3d upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I291f97847d02218c5f88519014a3646f9c5f6060 Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-axi-spi-engine.c | 58 ++++++++++++++++---------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/drivers/spi/spi-axi-spi-engine.c b/drivers/spi/spi-axi-spi-engine.c index e10c70cb87c9..c5a3a3189164 100644 --- a/drivers/spi/spi-axi-spi-engine.c +++ b/drivers/spi/spi-axi-spi-engine.c @@ -356,8 +356,8 @@ static bool spi_engine_read_rx_fifo(struct spi_engine *spi_engine) static irqreturn_t spi_engine_irq(int irq, void *devid) { - struct spi_controller *host = devid; - struct spi_engine *spi_engine = spi_controller_get_devdata(host); + struct spi_master *master = devid; + struct spi_engine *spi_engine = spi_master_get_devdata(master); unsigned int disable_int = 0; unsigned int pending; @@ -396,7 +396,7 @@ static irqreturn_t spi_engine_irq(int irq, void *devid) msg->status = 0; msg->actual_length = msg->frame_length; spi_engine->msg = NULL; - spi_finalize_current_message(host); + spi_finalize_current_message(master); disable_int |= SPI_ENGINE_INT_SYNC; } } @@ -412,11 +412,11 @@ static irqreturn_t spi_engine_irq(int irq, void *devid) return IRQ_HANDLED; } -static int spi_engine_transfer_one_message(struct spi_controller *host, +static int spi_engine_transfer_one_message(struct spi_master *master, struct spi_message *msg) { struct spi_engine_program p_dry, *p; - struct spi_engine *spi_engine = spi_controller_get_devdata(host); + struct spi_engine *spi_engine = spi_master_get_devdata(master); unsigned int int_enable = 0; unsigned long flags; size_t size; @@ -464,7 +464,7 @@ static int spi_engine_transfer_one_message(struct spi_controller *host, static int spi_engine_probe(struct platform_device *pdev) { struct spi_engine *spi_engine; - struct spi_controller *host; + struct spi_master *master; unsigned int version; int irq; int ret; @@ -477,29 +477,29 @@ static int spi_engine_probe(struct platform_device *pdev) if (!spi_engine) return -ENOMEM; - host = spi_alloc_host(&pdev->dev, 0); - if (!host) + master = spi_alloc_master(&pdev->dev, 0); + if (!master) return -ENOMEM; - spi_controller_set_devdata(host, spi_engine); + spi_master_set_devdata(master, spi_engine); spin_lock_init(&spi_engine->lock); spi_engine->clk = devm_clk_get(&pdev->dev, "s_axi_aclk"); if (IS_ERR(spi_engine->clk)) { ret = PTR_ERR(spi_engine->clk); - goto err_put_host; + goto err_put_master; } spi_engine->ref_clk = devm_clk_get(&pdev->dev, "spi_clk"); if (IS_ERR(spi_engine->ref_clk)) { ret = PTR_ERR(spi_engine->ref_clk); - goto err_put_host; + goto err_put_master; } ret = clk_prepare_enable(spi_engine->clk); if (ret) - goto err_put_host; + goto err_put_master; ret = clk_prepare_enable(spi_engine->ref_clk); if (ret) @@ -525,46 +525,46 @@ static int spi_engine_probe(struct platform_device *pdev) writel_relaxed(0xff, spi_engine->base + SPI_ENGINE_REG_INT_PENDING); writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_INT_ENABLE); - ret = request_irq(irq, spi_engine_irq, 0, pdev->name, host); + ret = request_irq(irq, spi_engine_irq, 0, pdev->name, master); if (ret) goto err_ref_clk_disable; - host->dev.of_node = pdev->dev.of_node; - host->mode_bits = SPI_CPOL | SPI_CPHA | SPI_3WIRE; - host->bits_per_word_mask = SPI_BPW_MASK(8); - host->max_speed_hz = clk_get_rate(spi_engine->ref_clk) / 2; - host->transfer_one_message = spi_engine_transfer_one_message; - host->num_chipselect = 8; + master->dev.of_node = pdev->dev.of_node; + master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_3WIRE; + master->bits_per_word_mask = SPI_BPW_MASK(8); + master->max_speed_hz = clk_get_rate(spi_engine->ref_clk) / 2; + master->transfer_one_message = spi_engine_transfer_one_message; + master->num_chipselect = 8; - ret = spi_register_controller(host); + ret = spi_register_master(master); if (ret) goto err_free_irq; - platform_set_drvdata(pdev, host); + platform_set_drvdata(pdev, master); return 0; err_free_irq: - free_irq(irq, host); + free_irq(irq, master); err_ref_clk_disable: clk_disable_unprepare(spi_engine->ref_clk); err_clk_disable: clk_disable_unprepare(spi_engine->clk); -err_put_host: - spi_controller_put(host); +err_put_master: + spi_master_put(master); return ret; } static void spi_engine_remove(struct platform_device *pdev) { - struct spi_controller *host = spi_controller_get(platform_get_drvdata(pdev)); - struct spi_engine *spi_engine = spi_controller_get_devdata(host); + struct spi_master *master = spi_master_get(platform_get_drvdata(pdev)); + struct spi_engine *spi_engine = spi_master_get_devdata(master); int irq = platform_get_irq(pdev, 0); - spi_unregister_controller(host); + spi_unregister_master(master); - free_irq(irq, host); + free_irq(irq, master); - spi_controller_put(host); + spi_master_put(master); writel_relaxed(0xff, spi_engine->base + SPI_ENGINE_REG_INT_PENDING); writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_INT_ENABLE);