diff options
| author |   Mark Brown <broonie@kernel.org> | 2020-12-28 14:20:00 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-28 14:20:00 +0000 |
| commit | 2ae6f64ce1ce304b502461fdfe0b96c8171ae2cc (patch) | |
| tree | 88e987c447daf2c29e2d4c15e58d1029b0cc78c2 /drivers/tty/serdev | |
| parent | regulator: bd718x7: Add enable times (diff) | |
| parent | Linux 5.11-rc1 (diff) | |
Merge tag 'v5.11-rc1' into regulator-5.11
Linux 5.11-rc1
Diffstat (limited to 'drivers/tty/serdev')
| -rw-r--r-- | drivers/tty/serdev/core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c index c5f0d936b003..aead0c0c9796 100644 --- a/drivers/tty/serdev/core.c +++ b/drivers/tty/serdev/core.c @@ -788,13 +788,10 @@ static int serdev_remove_device(struct device *dev, void *data) */ void serdev_controller_remove(struct serdev_controller *ctrl) { - int dummy; - if (!ctrl) return; - dummy = device_for_each_child(&ctrl->dev, NULL, - serdev_remove_device); + device_for_each_child(&ctrl->dev, NULL, serdev_remove_device); pm_runtime_disable(&ctrl->dev); device_del(&ctrl->dev); } @@ -803,6 +800,7 @@ EXPORT_SYMBOL_GPL(serdev_controller_remove); /** * serdev_driver_register() - Register client driver with serdev core * @sdrv: client driver to be associated with client-device. + * @owner: client driver owner to set. * * This API will register the client driver with the serdev framework. * It is typically called from the driver's module-init function. |