diff options
| author | Simon Glass <sjg@chromium.org> | 2015-02-27 22:06:31 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-04-23 09:05:52 -0600 |
| commit | 7f9875e733b79556ade508b88f88ac1f8a2c7e3c (patch) | |
| tree | 1ee6eb181cd092140684beb5d4021862944e3463 | |
| parent | 36fa61dc612e363fb60840a06333fc37ec3fb68e (diff) | |
| download | blackbird-obmc-uboot-7f9875e733b79556ade508b88f88ac1f8a2c7e3c.tar.gz blackbird-obmc-uboot-7f9875e733b79556ade508b88f88ac1f8a2c7e3c.zip | |
dm: core: Remove unbind operations when not required
The CONFIG_DM_DEVICE_REMOVE option takes out code related to removing
devices. It should also remove the 'unbind' code since if we cannot
remove we probably don't need to unbind.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | drivers/core/uclass.c | 4 | ||||
| -rw-r--r-- | include/dm/uclass-internal.h | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index 9fec8c9c7a..04e939d6c1 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -386,6 +386,7 @@ err: return ret; } +#ifdef CONFIG_DM_DEVICE_REMOVE int uclass_unbind_device(struct udevice *dev) { struct uclass *uc; @@ -401,6 +402,7 @@ int uclass_unbind_device(struct udevice *dev) list_del(&dev->uclass_node); return 0; } +#endif int uclass_resolve_seq(struct udevice *dev) { @@ -464,6 +466,7 @@ int uclass_post_probe_device(struct udevice *dev) return 0; } +#ifdef CONFIG_DM_DEVICE_REMOVE int uclass_pre_remove_device(struct udevice *dev) { struct uclass_driver *uc_drv; @@ -485,3 +488,4 @@ int uclass_pre_remove_device(struct udevice *dev) return 0; } +#endif diff --git a/include/dm/uclass-internal.h b/include/dm/uclass-internal.h index a9b2fbe2c6..9b68508667 100644 --- a/include/dm/uclass-internal.h +++ b/include/dm/uclass-internal.h @@ -116,7 +116,11 @@ int uclass_bind_device(struct udevice *dev); * @dev: Pointer to the device * #return 0 on success, -ve on error */ +#ifdef CONFIG_DM_DEVICE_REMOVE int uclass_unbind_device(struct udevice *dev); +#else +static inline int uclass_unbind_device(struct udevice *dev) { return 0; } +#endif /** * uclass_pre_probe_device() - Deal with a device that is about to be probed @@ -149,7 +153,11 @@ int uclass_post_probe_device(struct udevice *dev); * @dev: Pointer to the device * #return 0 on success, -ve on error */ +#ifdef CONFIG_DM_DEVICE_REMOVE int uclass_pre_remove_device(struct udevice *dev); +#else +static inline int uclass_pre_remove_device(struct udevice *dev) { return 0; } +#endif /** * uclass_find() - Find uclass by its id |
