d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r196779 in order to implement a different scheme for newbus locking

Browse Source 
methodology.

Requested by:	imp
This commit is contained in:
Attilio Rao 2009-09-13 15:08:19 +00:00
parent 7b8253c3eb
commit 4c68dee0fb
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/kern/subr_bus.c
View File

@ -2625,16 +2625,10 @@ device_attach(device_t dev)
{
int error;
if (dev->state >= DS_ATTACHING)
return (0);
device_sysctl_init(dev);
if (!device_is_quiet(dev))
device_print_child(dev->parent, dev);
dev->state = DS_ATTACHING;
if ((error = DEVICE_ATTACH(dev)) != 0) {
KASSERT(dev->state == DS_ATTACHING,
("%s: %p device state must not been changing", __func__,
dev));
printf("device_attach: %s%d attach returned %d\n",
dev->driver->name, dev->unit, error);
/* Unset the class; set in device_probe_child */
@ -2645,8 +2639,6 @@ device_attach(device_t dev)
dev->state = DS_NOTPRESENT;
return (error);
}
KASSERT(dev->state == DS_ATTACHING,
("%s: %p device state must not been changing", __func__, dev));
device_sysctl_update(dev);
dev->state = DS_ATTACHED;
devadded(dev);
@ -2682,16 +2674,8 @@ device_detach(device_t dev)
if (dev->state != DS_ATTACHED)
return (0);
dev->state = DS_DETACHING;
if ((error = DEVICE_DETACH(dev)) != 0) {
KASSERT(dev->state == DS_DETACHING,
("%s: %p device state must not been changing", __func__,
dev));
dev->state = DS_ATTACHED;
if ((error = DEVICE_DETACH(dev)) != 0)
return (error);
}
KASSERT(dev->state == DS_DETACHING,
("%s: %p device state must not been changing", __func__, dev));
devremoved(dev);
if (!device_is_quiet(dev))
device_printf(dev, "detached\n");
@ -2746,7 +2730,7 @@ device_quiesce(device_t dev)
int
device_shutdown(device_t dev)
{
if (dev->state < DS_ATTACHED || dev->state == DS_DETACHING)
if (dev->state < DS_ATTACHED)
return (0);
return (DEVICE_SHUTDOWN(dev));
}

5
sys/sys/bus.h
View File

@ -52,11 +52,8 @@ struct u_businfo {
typedef enum device_state {
DS_NOTPRESENT, /**< @brief not probed or probe failed */
DS_ALIVE, /**< @brief probe succeeded */
DS_ATTACHING, /**< @brief attaching is in progress */
DS_ATTACHED, /**< @brief attach method called */
DS_BUSY, /**< @brief device is open */
DS_DETACHING /**< @brief detaching is in progress */
DS_BUSY /**< @brief device is open */
} device_state_t;
/**