Merge remote-tracking branch 'spi/topic/core' into spi-next

This commit is contained in:
Mark Brown 2017-11-10 21:33:43 +00:00
commit b5f9208dea
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 3 additions and 1 deletions

View File

@ -2200,7 +2200,7 @@ static void devm_spi_unregister(struct device *dev, void *res)
* Context: can sleep * Context: can sleep
* *
* Register a SPI device as with spi_register_controller() which will * Register a SPI device as with spi_register_controller() which will
* automatically be unregister * automatically be unregistered and freed.
* *
* Return: zero on success, else a negative error code. * Return: zero on success, else a negative error code.
*/ */
@ -2241,6 +2241,8 @@ static int __unregister(struct device *dev, void *null)
* only ones directly touching chip registers. * only ones directly touching chip registers.
* *
* This must be called from context that can sleep. * This must be called from context that can sleep.
*
* Note that this function also drops a reference to the controller.
*/ */
void spi_unregister_controller(struct spi_controller *ctlr) void spi_unregister_controller(struct spi_controller *ctlr)
{ {