diff options
| author | Simon Glass <sjg@chromium.org> | 2021-10-24 02:26:05 +0300 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2021-11-29 02:51:51 +0300 |
| commit | 804431830593820575158aa5c4b098aab59efc88 (patch) | |
| tree | 8baf7751a924db68b550a409276bde47f7a95ce4 /include/dm | |
| parent | fb933d070eb00274bb7e041cae98e858208961e2 (diff) | |
| download | u-boot-804431830593820575158aa5c4b098aab59efc88.tar.xz | |
dm: core: Fix handling of uclass pre_unbind method
This method is currently called after the platform data has been freed.
But the pre_unbind() method may wish to access this, e.g. to free some
data structures stored there.
Split the unbinding of devices into two pieces, as is done with removal.
This corrects the problem.
Also tidy a code-style issue in device_remove() while we are here.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/dm')
| -rw-r--r-- | include/dm/uclass-internal.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/include/dm/uclass-internal.h b/include/dm/uclass-internal.h index 57c664c6da..49808c5c85 100644 --- a/include/dm/uclass-internal.h +++ b/include/dm/uclass-internal.h @@ -243,6 +243,17 @@ int uclass_find_device_by_phandle(enum uclass_id id, struct udevice *parent, */ int uclass_bind_device(struct udevice *dev); +#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE) +/** + * uclass_pre_unbind_device() - Prepare to deassociate device with a uclass + * + * Call any handled needed before uclass_unbind_device() is called + * + * @dev: Pointer to the device + * #return 0 on success, -ve on error + */ +int uclass_pre_unbind_device(struct udevice *dev); + /** * uclass_unbind_device() - Deassociate device with a uclass * @@ -251,9 +262,10 @@ int uclass_bind_device(struct udevice *dev); * @dev: Pointer to the device * #return 0 on success, -ve on error */ -#if CONFIG_IS_ENABLED(DM_DEVICE_REMOVE) int uclass_unbind_device(struct udevice *dev); + #else +static inline int uclass_pre_unbind_device(struct udevice *dev) { return 0; } static inline int uclass_unbind_device(struct udevice *dev) { return 0; } #endif |