For SPL we don't expect to need to remove a device. Save some code space by dropping this feature. The board config can define CONFIG_DM_DEVICE_REMOVE if this is in fact needed. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@ti.com>master
Simon Glass
10 years ago
parent
1151651831
commit
3ac435d33a
@ -0,0 +1,187 @@ |
||||
/*
|
||||
* Device manager |
||||
* |
||||
* Copyright (c) 2014 Google, Inc |
||||
* |
||||
* (C) Copyright 2012 |
||||
* Pavel Herrmann <morpheus.ibis@gmail.com> |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#include <common.h> |
||||
#include <errno.h> |
||||
#include <malloc.h> |
||||
#include <dm/device.h> |
||||
#include <dm/device-internal.h> |
||||
#include <dm/uclass.h> |
||||
#include <dm/uclass-internal.h> |
||||
#include <dm/util.h> |
||||
|
||||
/**
|
||||
* device_chld_unbind() - Unbind all device's children from the device |
||||
* |
||||
* On error, the function continues to unbind all children, and reports the |
||||
* first error. |
||||
* |
||||
* @dev: The device that is to be stripped of its children |
||||
* @return 0 on success, -ve on error |
||||
*/ |
||||
static int device_chld_unbind(struct udevice *dev) |
||||
{ |
||||
struct udevice *pos, *n; |
||||
int ret, saved_ret = 0; |
||||
|
||||
assert(dev); |
||||
|
||||
list_for_each_entry_safe(pos, n, &dev->child_head, sibling_node) { |
||||
ret = device_unbind(pos); |
||||
if (ret && !saved_ret) |
||||
saved_ret = ret; |
||||
} |
||||
|
||||
return saved_ret; |
||||
} |
||||
|
||||
/**
|
||||
* device_chld_remove() - Stop all device's children |
||||
* @dev: The device whose children are to be removed |
||||
* @return 0 on success, -ve on error |
||||
*/ |
||||
static int device_chld_remove(struct udevice *dev) |
||||
{ |
||||
struct udevice *pos, *n; |
||||
int ret; |
||||
|
||||
assert(dev); |
||||
|
||||
list_for_each_entry_safe(pos, n, &dev->child_head, sibling_node) { |
||||
ret = device_remove(pos); |
||||
if (ret) |
||||
return ret; |
||||
} |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int device_unbind(struct udevice *dev) |
||||
{ |
||||
struct driver *drv; |
||||
int ret; |
||||
|
||||
if (!dev) |
||||
return -EINVAL; |
||||
|
||||
if (dev->flags & DM_FLAG_ACTIVATED) |
||||
return -EINVAL; |
||||
|
||||
drv = dev->driver; |
||||
assert(drv); |
||||
|
||||
if (drv->unbind) { |
||||
ret = drv->unbind(dev); |
||||
if (ret) |
||||
return ret; |
||||
} |
||||
|
||||
ret = device_chld_unbind(dev); |
||||
if (ret) |
||||
return ret; |
||||
|
||||
ret = uclass_unbind_device(dev); |
||||
if (ret) |
||||
return ret; |
||||
|
||||
if (dev->parent) |
||||
list_del(&dev->sibling_node); |
||||
free(dev); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
/**
|
||||
* device_free() - Free memory buffers allocated by a device |
||||
* @dev: Device that is to be started |
||||
*/ |
||||
void device_free(struct udevice *dev) |
||||
{ |
||||
int size; |
||||
|
||||
if (dev->driver->priv_auto_alloc_size) { |
||||
free(dev->priv); |
||||
dev->priv = NULL; |
||||
} |
||||
if (dev->flags & DM_FLAG_ALLOC_PDATA) { |
||||
free(dev->platdata); |
||||
dev->platdata = NULL; |
||||
} |
||||
size = dev->uclass->uc_drv->per_device_auto_alloc_size; |
||||
if (size) { |
||||
free(dev->uclass_priv); |
||||
dev->uclass_priv = NULL; |
||||
} |
||||
if (dev->parent) { |
||||
size = dev->parent->driver->per_child_auto_alloc_size; |
||||
if (size) { |
||||
free(dev->parent_priv); |
||||
dev->parent_priv = NULL; |
||||
} |
||||
} |
||||
} |
||||
|
||||
int device_remove(struct udevice *dev) |
||||
{ |
||||
struct driver *drv; |
||||
int ret; |
||||
|
||||
if (!dev) |
||||
return -EINVAL; |
||||
|
||||
if (!(dev->flags & DM_FLAG_ACTIVATED)) |
||||
return 0; |
||||
|
||||
drv = dev->driver; |
||||
assert(drv); |
||||
|
||||
ret = uclass_pre_remove_device(dev); |
||||
if (ret) |
||||
return ret; |
||||
|
||||
ret = device_chld_remove(dev); |
||||
if (ret) |
||||
goto err; |
||||
|
||||
if (drv->remove) { |
||||
ret = drv->remove(dev); |
||||
if (ret) |
||||
goto err_remove; |
||||
} |
||||
|
||||
if (dev->parent && dev->parent->driver->child_post_remove) { |
||||
ret = dev->parent->driver->child_post_remove(dev); |
||||
if (ret) { |
||||
dm_warn("%s: Device '%s' failed child_post_remove()", |
||||
__func__, dev->name); |
||||
} |
||||
} |
||||
|
||||
device_free(dev); |
||||
|
||||
dev->seq = -1; |
||||
dev->flags &= ~DM_FLAG_ACTIVATED; |
||||
|
||||
return ret; |
||||
|
||||
err_remove: |
||||
/* We can't put the children back */ |
||||
dm_warn("%s: Device '%s' failed to remove, but children are gone\n", |
||||
__func__, dev->name); |
||||
err: |
||||
ret = uclass_post_probe_device(dev); |
||||
if (ret) { |
||||
dm_warn("%s: Device '%s' failed to post_probe on error path\n", |
||||
__func__, dev->name); |
||||
} |
||||
|
||||
return ret; |
||||
} |
||||
Loading…
Reference in new issue