dm: drop CONFIG_DM_DEVICE_REMOVE from uncmd list

[karo-tx-uboot.git] / drivers / core / device.c

diff --git a/drivers/core/device.c b/drivers/core/device.c
index bbe7a94f2a1f35a5cbd408627b72ef444dbd0965..56b90817de0b444e653c9749fe1163e2348725ec 100644 (file)
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -140,7 +140,7 @@ int device_bind(struct udevice *parent, const struct driver *drv,
        return 0;
 
 fail_child_post_bind:
-       if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
+       if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) {
                if (drv->unbind && drv->unbind(dev)) {
                        dm_warn("unbind() method failed on dev '%s' on error path\n",
                                dev->name);
@@ -148,14 +148,14 @@ fail_child_post_bind:
        }
 
 fail_bind:
-       if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
+       if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) {
                if (uclass_unbind_device(dev)) {
                        dm_warn("Failed to unbind dev '%s' on error path\n",
                                dev->name);
                }
        }
 fail_uclass_bind:
-       if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
+       if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) {
                list_del(&dev->sibling_node);
                if (dev->flags & DM_FLAG_ALLOC_PARENT_PDATA) {
                        free(dev->parent_platdata);