diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-08-11 05:06:46 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-08-11 08:47:08 +1000 |
| commit | 9efba20291f2e816e9c043875bf4e1f0f1416c63 (patch) | |
| tree | 94fb01ad9081a6cc06582fb15c311670bc06531d /drivers/gpu/drm/drm_dp_aux_bus.c | |
| parent | 49f7844b08844ac7029f997702099c552566262b (diff) | |
| parent | fc7a6209d5710618eb4f72a77cd81b8d694ecf89 (diff) | |
| download | linux-9efba20291f2e816e9c043875bf4e1f0f1416c63.tar.gz linux-9efba20291f2e816e9c043875bf4e1f0f1416c63.tar.bz2 linux-9efba20291f2e816e9c043875bf4e1f0f1416c63.zip | |
Merge tag 'bus_remove_return_void-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core into drm-next
Bus: Make remove callback return void tag
Tag for other trees/branches to pull from in order to have a stable
place to build off of if they want to add new busses for 5.15.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
[airlied: fixed up merge conflict in drm]
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://patchwork.freedesktop.org/patch/msgid/YPkwQwf0dUKnGA7L@kroah.com
Diffstat (limited to 'drivers/gpu/drm/drm_dp_aux_bus.c')
| -rw-r--r-- | drivers/gpu/drm/drm_dp_aux_bus.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_dp_aux_bus.c b/drivers/gpu/drm/drm_dp_aux_bus.c index e49a70f3691b..298ea7a49591 100644 --- a/drivers/gpu/drm/drm_dp_aux_bus.c +++ b/drivers/gpu/drm/drm_dp_aux_bus.c @@ -67,9 +67,8 @@ static int dp_aux_ep_probe(struct device *dev) * * Calls through to the endpoint driver remove. * - * Return: 0 if no error or negative error code. */ -static int dp_aux_ep_remove(struct device *dev) +static void dp_aux_ep_remove(struct device *dev) { struct dp_aux_ep_driver *aux_ep_drv = to_dp_aux_ep_drv(dev->driver); struct dp_aux_ep_device *aux_ep = to_dp_aux_ep_dev(dev); @@ -77,8 +76,6 @@ static int dp_aux_ep_remove(struct device *dev) if (aux_ep_drv->remove) aux_ep_drv->remove(aux_ep); dev_pm_domain_detach(dev, true); - - return 0; } /** |