diff options
| author | Mark Brown <broonie@kernel.org> | 2024-02-08 20:19:18 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-02-08 20:19:18 +0000 |
| commit | 0da9a7e5c86b003a9b446b30c90eaf96b2e442c2 (patch) | |
| tree | 635e28216dae3a2a91806df91c5a3962998aa891 /drivers/spi/spi.c | |
| parent | 0f0212558bc9e33fad4148d3f44745a367076b20 (diff) | |
| parent | 76b31eb4c2da3ddb3195cc14f6aad24908adf524 (diff) | |
spi: get rid of some legacy macros
Merge series from Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:
This series finishes off the removal of some of the legacy names for
SPI controllers and devices.
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 3270a1337a5b..c2b10e2c75f0 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -584,7 +584,7 @@ struct spi_device *spi_alloc_device(struct spi_controller *ctlr) return NULL; } - spi->master = spi->controller = ctlr; + spi->controller = ctlr; spi->dev.parent = &ctlr->dev; spi->dev.bus = &spi_bus_type; spi->dev.release = spidev_release; @@ -1717,6 +1717,10 @@ static int __spi_pump_transfer_message(struct spi_controller *ctlr, pm_runtime_put_noidle(ctlr->dev.parent); dev_err(&ctlr->dev, "Failed to power device: %d\n", ret); + + msg->status = ret; + spi_finalize_current_message(ctlr); + return ret; } } |