Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
linux
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Martyn Welch
linux
Commits
b5f9208d
Unverified
Commit
b5f9208d
authored
7 years ago
by
Mark Brown
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'spi/topic/core' into spi-next
parents
130555cf
68b892f1
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
drivers/spi/spi.c
+3
-1
3 additions, 1 deletion
drivers/spi/spi.c
with
3 additions
and
1 deletion
drivers/spi/spi.c
+
3
−
1
View file @
b5f9208d
...
@@ -2200,7 +2200,7 @@ static void devm_spi_unregister(struct device *dev, void *res)
...
@@ -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 unregister
ed 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)
...
@@ -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
)
{
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment