github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 09:36:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

spi: pl022: switch to managed controller allocation

Browse Source 
Switch to device managed controller allocation to simplify error
handling and to avoid having to take another reference during
deregistration.

Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Linus Walleij <linusw@kernel.org>
Link: https://patch.msgid.link/20260505072909.618363-4-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Johan Hovold 2026-05-05 09:28:52 +02:00 committed by Mark Brown
parent dda3a77e1a
commit 02efc5557c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/spi/spi-pl022.c
View File

@ -1868,7 +1868,7 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id)
}
/* Allocate host with space for data */
host = spi_alloc_host(dev, sizeof(struct pl022));
host = devm_spi_alloc_host(dev, sizeof(struct pl022));
if (host == NULL) {
dev_err(&adev->dev, "probe - cannot alloc SPI host\n");
return -ENOMEM;
@ -1907,7 +1907,7 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id)
status = amba_request_regions(adev, NULL);
if (status)
goto err_no_ioregion;
return status;
pl022->phybase = adev->res.start;
pl022->virtbase = devm_ioremap(dev, adev->res.start,
@ -1984,8 +1984,7 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id)
err_no_clk:
err_no_ioremap:
amba_release_regions(adev);
err_no_ioregion:
spi_controller_put(host);
return status;
}
@ -1997,8 +1996,6 @@ pl022_remove(struct amba_device *adev)
if (!pl022)
return;
spi_controller_get(pl022->host);
spi_unregister_controller(pl022->host);
/*
@ -2012,8 +2009,6 @@ pl022_remove(struct amba_device *adev)
pl022_dma_remove(pl022);
amba_release_regions(adev);
spi_controller_put(pl022->host);
}
#ifdef CONFIG_PM_SLEEP