Linux SPI subsystem development
 help / color / mirror / Atom feed
From: Johan Hovold <johan@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: Eddie James <eajames@linux.ibm.com>,
	Yang Shen <shenyang39@huawei.com>,
	Neil Armstrong <neil.armstrong@linaro.org>,
	Kevin Hilman <khilman@baylibre.com>,
	linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org,
	Johan Hovold <johan@kernel.org>
Subject: [PATCH 05/12] spi: fsi: switch to managed controller allocation
Date: Mon, 11 May 2026 17:04:01 +0200	[thread overview]
Message-ID: <20260511150408.796155-6-johan@kernel.org> (raw)
In-Reply-To: <20260511150408.796155-1-johan@kernel.org>

Switch to device managed controller allocation for consistency and to
simplify error handling.

Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/spi/spi-fsi.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/spi/spi-fsi.c b/drivers/spi/spi-fsi.c
index f6a75f0184c4..451cb4cfdb9c 100644
--- a/drivers/spi/spi-fsi.c
+++ b/drivers/spi/spi-fsi.c
@@ -554,7 +554,7 @@ static int fsi_spi_probe(struct fsi_device *fsi)
 		if (of_property_read_u32(np, "reg", &base))
 			continue;
 
-		ctlr = spi_alloc_host(dev, sizeof(*ctx));
+		ctlr = devm_spi_alloc_host(dev, sizeof(*ctx));
 		if (!ctlr)
 			break;
 
@@ -571,9 +571,9 @@ static int fsi_spi_probe(struct fsi_device *fsi)
 
 		rc = devm_spi_register_controller(dev, ctlr);
 		if (rc)
-			spi_controller_put(ctlr);
-		else
-			num_controllers_registered++;
+			continue;
+
+		num_controllers_registered++;
 	}
 
 	if (!num_controllers_registered)
-- 
2.53.0


  parent reply	other threads:[~2026-05-11 15:04 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-11 15:03 [PATCH 00/12] spi: switch to managed controller allocation (part 3/3) Johan Hovold
2026-05-11 15:03 ` [PATCH 01/12] spi: altera-platform: switch to managed controller allocation Johan Hovold
2026-05-11 15:03 ` [PATCH 02/12] spi: armada-3700: " Johan Hovold
2026-05-11 15:03 ` [PATCH 03/12] spi: clps711x: " Johan Hovold
2026-05-11 15:04 ` [PATCH 04/12] spi: falcon: " Johan Hovold
2026-05-11 15:04 ` Johan Hovold [this message]
2026-05-11 15:04 ` [PATCH 06/12] spi: hisi-sfc-v3xx: " Johan Hovold
2026-05-11 15:04 ` [PATCH 07/12] spi: jcore: " Johan Hovold
2026-05-11 15:04 ` [PATCH 08/12] spi: lp8841-rtc: " Johan Hovold
2026-05-11 15:04 ` [PATCH 09/12] spi: lp8841-rtc: drop unused ifdef Johan Hovold
2026-05-11 15:04 ` [PATCH 10/12] spi: meson-spifc: switch to managed controller allocation Johan Hovold
2026-05-11 15:04 ` [PATCH 11/12] spi: mux: " Johan Hovold
2026-05-11 15:04 ` [PATCH 12/12] spi: xlp: " Johan Hovold

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260511150408.796155-6-johan@kernel.org \
    --to=johan@kernel.org \
    --cc=broonie@kernel.org \
    --cc=eajames@linux.ibm.com \
    --cc=khilman@baylibre.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-spi@vger.kernel.org \
    --cc=neil.armstrong@linaro.org \
    --cc=shenyang39@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox