From: Nuno Sa <nuno.sa@analog.com>
Date: Fri, 5 Jul 2024 15:12:40 +0000 (+0200)
Subject: spi: xcomm: make use of devm_spi_alloc_host()
X-Git-Tag: v6.11-rc1~205^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8ba259764c745e7de20ec517ae920ecd491b687;p=thirdparty%2Fkernel%2Flinux.git

spi: xcomm: make use of devm_spi_alloc_host()

Use devm_spi_alloc_host() so that there's no need to call
spi_controller_put() in the error path.

Signed-off-by: Nuno Sa <nuno.sa@analog.com>
Link: https://patch.msgid.link/20240705-dev-spi-xcomm-gpiochip-v2-2-b10842fc9636@analog.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/drivers/spi/spi-xcomm.c b/drivers/spi/spi-xcomm.c
index 063ce75af6504..5bbc250bc0534 100644
--- a/drivers/spi/spi-xcomm.c
+++ b/drivers/spi/spi-xcomm.c
@@ -248,7 +248,7 @@ static int spi_xcomm_probe(struct i2c_client *i2c)
 	struct spi_controller *host;
 	int ret;
 
-	host = spi_alloc_host(&i2c->dev, sizeof(*spi_xcomm));
+	host = devm_spi_alloc_host(&i2c->dev, sizeof(*spi_xcomm));
 	if (!host)
 		return -ENOMEM;
 
@@ -265,7 +265,7 @@ static int spi_xcomm_probe(struct i2c_client *i2c)
 
 	ret = devm_spi_register_controller(&i2c->dev, host);
 	if (ret < 0)
-		spi_controller_put(host);
+		return ret;
 
 	return spi_xcomm_gpio_add(spi_xcomm);
 }