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 /include/linux | |
parent | 49f7844b08844ac7029f997702099c552566262b (diff) | |
parent | fc7a6209d5710618eb4f72a77cd81b8d694ecf89 (diff) | |
download | linux-stable-9efba20291f2e816e9c043875bf4e1f0f1416c63.tar.gz linux-stable-9efba20291f2e816e9c043875bf4e1f0f1416c63.tar.bz2 linux-stable-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 'include/linux')
-rw-r--r-- | include/linux/device/bus.h | 2 | ||||
-rw-r--r-- | include/linux/pci-epf.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/device/bus.h b/include/linux/device/bus.h index 1ea5e1d1545b..062777a45a74 100644 --- a/include/linux/device/bus.h +++ b/include/linux/device/bus.h @@ -91,7 +91,7 @@ struct bus_type { int (*uevent)(struct device *dev, struct kobj_uevent_env *env); int (*probe)(struct device *dev); void (*sync_state)(struct device *dev); - int (*remove)(struct device *dev); + void (*remove)(struct device *dev); void (*shutdown)(struct device *dev); int (*online)(struct device *dev); diff --git a/include/linux/pci-epf.h b/include/linux/pci-epf.h index 2debc27ba95e..8292420426f3 100644 --- a/include/linux/pci-epf.h +++ b/include/linux/pci-epf.h @@ -85,7 +85,7 @@ struct pci_epf_ops { */ struct pci_epf_driver { int (*probe)(struct pci_epf *epf); - int (*remove)(struct pci_epf *epf); + void (*remove)(struct pci_epf *epf); struct device_driver driver; struct pci_epf_ops *ops; |