From b0e59b447d48940c2da359966eed2ff7a9d0bd83 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Jul 2024 10:02:01 +0000 Subject: [PATCH] Revert "spi: axi-spi-engine: simplify driver data allocation" This reverts commit be632e909c057d2f6c3c6ec9ca7b968b2dff7bed which is commit 9e4ce5220eedea2cc440f3961dec1b5122e815b2 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: I53033e5988e2e24fee2847555b1c148ef6aea4c1 Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-axi-spi-engine.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-axi-spi-engine.c b/drivers/spi/spi-axi-spi-engine.c index 492882213bb2..861578aa6ea1 100644 --- a/drivers/spi/spi-axi-spi-engine.c +++ b/drivers/spi/spi-axi-spi-engine.c @@ -473,11 +473,15 @@ static int spi_engine_probe(struct platform_device *pdev) if (irq <= 0) return -ENXIO; - host = spi_alloc_host(&pdev->dev, sizeof(*spi_engine)); + spi_engine = devm_kzalloc(&pdev->dev, sizeof(*spi_engine), GFP_KERNEL); + if (!spi_engine) + return -ENOMEM; + + host = spi_alloc_host(&pdev->dev, 0); if (!host) return -ENOMEM; - spi_engine = spi_controller_get_devdata(host); + spi_controller_set_devdata(host, spi_engine); spin_lock_init(&spi_engine->lock);